X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flvm.c;h=5e130d80c75c145289d1d853902176a3da05c9ba;hb=f66916deea905254061bb07245e007471faf2ecf;hp=82d7f6fef0006854c0b64cd1be712e79a2015901;hpb=061c3c091d725d58dfe1e7525a8d72a1ea389a8a;p=collectd.git diff --git a/src/lvm.c b/src/lvm.c index 82d7f6fe..5e130d80 100644 --- a/src/lvm.c +++ b/src/lvm.c @@ -18,12 +18,13 @@ * * Authors: * Chad Malfait - * Benjamin Gilbert + * Benjamin Gilbert **/ #include #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -54,15 +55,11 @@ static char const *get_lv_property_string(lv_t lv, char const *property) static void lvm_submit (char const *plugin_instance, char const *type_instance, uint64_t ivalue) { - value_t v; value_list_t vl = VALUE_LIST_INIT; - v.gauge = (gauge_t) ivalue; - - vl.values = &v; + vl.values = &(value_t) { .gauge = (gauge_t) ivalue }; vl.values_len = 1; - sstrncpy(vl.host, hostname_g, sizeof (vl.host)); 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)); @@ -125,10 +122,6 @@ static void vg_read(vg_t vg, char const *vg_name) } dm_list_iterate_items(lvl, lvs) { - lvm_submit(vg_name, lvm_lv_get_name(lvl->lv), lvm_lv_get_size(lvl->lv)); - } - - dm_list_iterate_items(lvl, lvs) { name = lvm_lv_get_name(lvl->lv); attrs = get_lv_property_string(lvl->lv, "lv_attr"); size = lvm_lv_get_size(lvl->lv);