From 3a3a9891735c0cb1b630dde6227ce1eceefa392a Mon Sep 17 00:00:00 2001 From: Chad Malfait Date: Wed, 10 Apr 2013 23:48:38 -0600 Subject: [PATCH] Changed data type from vg to vol_group and lv to logical_vol to be more descriptive --- clean | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/types.db | 3 +++ src/volume.c | 8 ++++---- 3 files changed, 59 insertions(+), 4 deletions(-) create mode 100755 clean diff --git a/clean b/clean new file mode 100755 index 00000000..9defb05d --- /dev/null +++ b/clean @@ -0,0 +1,52 @@ +#! /bin/sh + +set -x + +true \ +&& rm -f aclocal.m4 \ +&& rm -f -r autom4te.cache \ +&& rm -f collectd-*.tar.bz2 \ +&& rm -f collectd-*.tar.gz \ +&& rm -f compile \ +&& rm -f config.guess \ +&& rm -f config.log \ +&& rm -f config.status \ +&& rm -f config.sub \ +&& rm -f configure \ +&& rm -f depcomp \ +&& rm -f install-sh \ +&& rm -f -r libltdl \ +&& rm -f libtool \ +&& rm -f ltmain.sh \ +&& rm -f Makefile \ +&& rm -f Makefile.in \ +&& rm -f missing \ +&& rm -f -r src/.deps \ +&& rm -f -r src/.libs \ +&& rm -f src/*.o \ +&& rm -f src/*.la \ +&& rm -f src/*.lo \ +&& rm -f src/collectd \ +&& rm -f src/collectd.1 \ +&& rm -f src/config.h \ +&& rm -f src/config.h.in \ +&& rm -f src/config.h.in~ \ +&& rm -f src/Makefile \ +&& rm -f src/Makefile.in \ +&& rm -f src/stamp-h1 \ +&& rm -f src/stamp-h1.in \ +&& rm -f -r src/libping/.libs \ +&& rm -f src/libping/*.o \ +&& rm -f src/libping/*.la \ +&& rm -f src/libping/*.lo \ +&& rm -f src/libping/config.h \ +&& rm -f src/libping/config.h.in \ +&& rm -f src/libping/Makefile \ +&& rm -f src/libping/Makefile.in \ +&& rm -f src/libping/stamp-h2 \ +&& rm -f -r src/libcollectdclient/.libs \ +&& rm -f src/libcollectdclient/*.o \ +&& rm -f src/libcollectdclient/*.la \ +&& rm -f src/libcollectdclient/*.lo \ +&& rm -f bindings/.perl-directory-stamp \ +&& rm -f -r bindings/buildperl diff --git a/src/types.db b/src/types.db index 3358f5df..fc51627b 100644 --- a/src/types.db +++ b/src/types.db @@ -89,6 +89,7 @@ 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 @@ -174,6 +175,7 @@ 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 @@ -186,6 +188,7 @@ voltage value:GAUGE:U:U vs_memory value:GAUGE:0:9223372036854775807 vs_processes value:GAUGE:0:65535 vs_threads value:GAUGE:0:65535 + # # Legacy types # (required for the v5 upgrade target) diff --git a/src/volume.c b/src/volume.c index a6fe0c3d..009c9be1 100644 --- a/src/volume.c +++ b/src/volume.c @@ -38,9 +38,9 @@ static void vg_submit(const char *vg_name, gauge_t used, gauge_t free, gauge_t s vl.values_len = STATIC_ARRAY_SIZE (values); sstrncpy(vl.host, hostname_g, sizeof (vl.host)); - sstrncpy(vl.plugin, "vg", sizeof (vl.plugin)); + sstrncpy(vl.plugin, "vol_group", sizeof (vl.plugin)); sstrncpy(vl.plugin_instance, vg_name, sizeof (vl.plugin_instance)); - sstrncpy(vl.type, "vg", sizeof (vl.type)); + sstrncpy(vl.type, "vol_group", sizeof (vl.type)); sstrncpy(vl.type_instance, vg_name, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); @@ -58,9 +58,9 @@ static void lv_submit(const char *vg_name, const char *lv_name, gauge_t value) vl.values_len = STATIC_ARRAY_SIZE (values); sstrncpy(vl.host, hostname_g, sizeof (vl.host)); - sstrncpy(vl.plugin, "vg", sizeof (vl.plugin)); + sstrncpy(vl.plugin, "vol_group", sizeof (vl.plugin)); sstrncpy(vl.plugin_instance, vg_name, sizeof (vl.plugin_instance)); - sstrncpy(vl.type, "lv", sizeof (vl.type)); + sstrncpy(vl.type, "logical_vol", sizeof (vl.type)); sstrncpy(vl.type_instance, lv_name, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); -- 2.11.0