volume plugin: Fix a couple of issues from the code review.

* Use df_complex as data type.
* Submit LV sizes and "free", but not "total" and "used".
* Fix error handling; don't use variable if it is NULL, remove calls to
  exit().

diff --git a/src/types.db b/src/types.db
index fc51627be73a2876d7cb2ad45382ddd8355b06fd..6f1eaf6139d0d74f079d8e7093a9a0013eeadc9f 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -89,7 +89,6 @@ irq                   value:DERIVE:0:U
 latency                        value:GAUGE:0:65535
 links                  value:GAUGE:0:U
 load                   shortterm:GAUGE:0:100, midterm:GAUGE:0:100, longterm:GAUGE:0:100
-logical_vol             value:GAUGE:0:U
 md_disks               value:GAUGE:0:U
 memcached_command      value:DERIVE:0:U
 memcached_connections  value:GAUGE:0:U
@@ -175,7 +174,6 @@ total_values                value:DERIVE:0:U
 uptime                 value:GAUGE:0:4294967295
 users                  value:GAUGE:0:65535
 vcpu                   value:GAUGE:0:U
-vol_group               used:GAUGE:0:U, free:GAUGE:0:U, size:GAUGE:0:U
 virt_cpu_total         value:DERIVE:0:U
 virt_vcpu              value:DERIVE:0:U
 vmpage_action          value:DERIVE:0:U

diff --git a/src/volume.c b/src/volume.c
index 009c9be123d06a72416d7fbd031c7ec1d0acba62..009f4429663bd02d34fc1f28cf6132d12a048d5a 100644 (file)
--- a/src/volume.c
+++ b/src/volume.c
@@ -25,97 +25,79 @@
 #include "common.h"
 #include "plugin.h"
 
-static void vg_submit(const char *vg_name, gauge_t used, gauge_t free, gauge_t size)
+static void lvm_submit (char const *plugin_instance, char const *type_instance,
+        uint64_t ivalue)
 {
-    value_t values[3];
+    value_t v;
     value_list_t vl = VALUE_LIST_INIT;
 
-    values[0].gauge = used;
-    values[1].gauge = free;
-    values[2].gauge = size;
+    v.gauge = (gauge_t) ivalue;
 
-    vl.values = values;
-    vl.values_len = STATIC_ARRAY_SIZE (values);
+    vl.values = &v;
+    vl.values_len = 1;
 
     sstrncpy(vl.host, hostname_g, sizeof (vl.host));
-    sstrncpy(vl.plugin, "vol_group", sizeof (vl.plugin));
-    sstrncpy(vl.plugin_instance, vg_name, sizeof (vl.plugin_instance));
-    sstrncpy(vl.type, "vol_group", sizeof (vl.type));
-    sstrncpy(vl.type_instance, vg_name, sizeof (vl.type_instance));
+    sstrncpy(vl.plugin, "lvm", sizeof (vl.plugin));
+    sstrncpy(vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+    sstrncpy(vl.type, "df_complex", sizeof (vl.type));
+    sstrncpy(vl.type_instance, type_instance, sizeof (vl.type_instance));
 
     plugin_dispatch_values (&vl);
 }
 
-static void lv_submit(const char *vg_name, const char *lv_name, gauge_t value)
-{
-
-    value_t values[1];
-    value_list_t vl = VALUE_LIST_INIT;
-
-    values[0].gauge = value;
-
-    vl.values = values;
-    vl.values_len = STATIC_ARRAY_SIZE (values);
-
-    sstrncpy(vl.host, hostname_g, sizeof (vl.host));
-    sstrncpy(vl.plugin, "vol_group", sizeof (vl.plugin));
-    sstrncpy(vl.plugin_instance, vg_name, sizeof (vl.plugin_instance));
-    sstrncpy(vl.type, "logical_vol", sizeof (vl.type));
-    sstrncpy(vl.type_instance, lv_name, sizeof (vl.type_instance));
-
-    plugin_dispatch_values (&vl); 
-}
-
-static int lv_read(vg_t vg, const char *vg_name, unsigned long vg_free, unsigned long vg_size)
+static int vg_read(vg_t vg, char const *vg_name)
 {
     struct dm_list *lvs;
     struct lvm_lv_list *lvl;
-    unsigned long vg_used = 0;
-
-    vg_used = vg_size - vg_free;
-    lvs = lvm_vg_list_lvs(vg);
 
-    vg_submit(vg_name, vg_used, vg_free, vg_size);
+    lvm_submit (vg_name, "free", lvm_vg_get_free_size(vg));
 
+    lvs = lvm_vg_list_lvs(vg);
     dm_list_iterate_items(lvl, lvs) {
-         lv_submit(vg_name, lvm_lv_get_name(lvl->lv), lvm_lv_get_size(lvl->lv));
+         lvm_submit(vg_name, lvm_lv_get_name(lvl->lv), lvm_lv_get_size(lvl->lv));
     }
+
     return (0);
 }
 
-static int vg_read(void)
+static int lvm_read(void)
 {
     lvm_t lvm;
-    vg_t vg;
     struct dm_list *vg_names;
     struct lvm_str_list *name_list;
 
     lvm = lvm_init(NULL);
     if (!lvm) {
-       ERROR("volume plugin: lvm_init failed: %s", lvm_errmsg(lvm));
-        lvm_quit(lvm);
-        exit(-1);
+        ERROR("volume plugin: lvm_init failed.");
+        return (-1);
     }
 
     vg_names = lvm_list_vg_names(lvm);
     if (!vg_names) {
-       ERROR("volume plugin lvm_list_vg_name failed %s", lvm_errmsg(lvm));
+        ERROR("volume plugin lvm_list_vg_name failed %s", lvm_errmsg(lvm));
         lvm_quit(lvm);
-        exit(-1);
+        return (-1);
     }
 
     dm_list_iterate_items(name_list, vg_names) {
+        vg_t vg;
+
         vg = lvm_vg_open(lvm, name_list->str, "r", 0);
-        lv_read(vg, name_list->str, lvm_vg_get_free_size(vg), lvm_vg_get_size(vg));
+        if (!vg) {
+            ERROR ("volume plugin: lvm_vg_open (%s) failed: %s",
+                    name_list->str, lvm_errmsg(lvm));
+            continue;
+        }
 
+        vg_read(vg, name_list->str);
         lvm_vg_close(vg);
     }
 
     lvm_quit(lvm);
     return (0);
-} /*vg_read */
+} /*lvm_read */
 
 void module_register(void)
 {
-       plugin_register_read("volume", vg_read);
+    plugin_register_read("volume", lvm_read);
 } /* void module_register */