From c3e309c6a5fe6b1405a4aad936599788b01b062d Mon Sep 17 00:00:00 2001 From: dipohl Date: Wed, 22 Feb 2017 20:37:27 +0100 Subject: [PATCH] Category Tree: Reduce number of categories power5 -> cpu directories for different ftp servers --- plugins/funkytown/denon_x311_volume | 2 +- plugins/power5/consumed_cpu_cycles | 2 +- plugins/power5/cpu_entitlemens | 2 +- plugins/power5/cpu_in_lpar | 2 +- plugins/power5/weight_of_a_lpar | 2 +- plugins/{ftp => proftpd}/proftpd | 2 +- plugins/{ftp => proftpd}/proftpd_bytes | 2 +- plugins/{ftp => proftpd}/proftpd_count | 2 +- plugins/{ftp => pure-ftpd}/pure-ftpd | 0 plugins/{ftp => pure-ftpd}/pure-ftpd-bw | 0 plugins/{ftp => pure-ftpd}/pure-ftpd-logs | 0 plugins/{ftp => pure-ftpd}/pureftpd_count | 2 +- plugins/{ftp => pure-ftpd}/pureftpd_traffic | 0 plugins/{ftp => vsftpd}/vsftpd | 0 plugins/{ftp => vsftpd}/vsftpd-rel | 0 15 files changed, 9 insertions(+), 9 deletions(-) rename plugins/{ftp => proftpd}/proftpd (94%) rename plugins/{ftp => proftpd}/proftpd_bytes (98%) rename plugins/{ftp => proftpd}/proftpd_count (97%) rename plugins/{ftp => pure-ftpd}/pure-ftpd (100%) rename plugins/{ftp => pure-ftpd}/pure-ftpd-bw (100%) rename plugins/{ftp => pure-ftpd}/pure-ftpd-logs (100%) rename plugins/{ftp => pure-ftpd}/pureftpd_count (97%) rename plugins/{ftp => pure-ftpd}/pureftpd_traffic (100%) rename plugins/{ftp => vsftpd}/vsftpd (100%) rename plugins/{ftp => vsftpd}/vsftpd-rel (100%) diff --git a/plugins/funkytown/denon_x311_volume b/plugins/funkytown/denon_x311_volume index 1575a23a..4dfd2e98 100755 --- a/plugins/funkytown/denon_x311_volume +++ b/plugins/funkytown/denon_x311_volume @@ -32,7 +32,7 @@ BEGIN { if (ARGV[1] == "config") { print "graph_title Denon AVR-4311 Volume" - print "graph_category funkytown" + print "graph_category radio" print "volume.label Volume" print "volume.type GAUGE" exit 0 diff --git a/plugins/power5/consumed_cpu_cycles b/plugins/power5/consumed_cpu_cycles index e8c8e1c8..2006286d 100755 --- a/plugins/power5/consumed_cpu_cycles +++ b/plugins/power5/consumed_cpu_cycles @@ -40,7 +40,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title Consumed CPU cycles' echo 'graph_args -l 0' - echo 'graph_category Power5' + echo 'graph_category cpu' echo 'graph_vlabel CPU cycles' echo 'graph_info This graph shows the CPU cycles on an uncapped LPAR' diff --git a/plugins/power5/cpu_entitlemens b/plugins/power5/cpu_entitlemens index 5afba7dd..7b8c9675 100755 --- a/plugins/power5/cpu_entitlemens +++ b/plugins/power5/cpu_entitlemens @@ -39,7 +39,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title CPU entitlements' echo 'graph_args -l 0' - echo 'graph_category Power5' + echo 'graph_category cpu' echo 'graph_vlabel entitlements' echo 'graph_info This graph shows the actual and max entitlements for a LPAR' diff --git a/plugins/power5/cpu_in_lpar b/plugins/power5/cpu_in_lpar index 8de54975..aab20829 100755 --- a/plugins/power5/cpu_in_lpar +++ b/plugins/power5/cpu_in_lpar @@ -38,7 +38,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title CPU in LPAR' echo 'graph_args -l 0' - echo 'graph_category Power5' + echo 'graph_category cpu' echo 'graph_vlabel CPUs in LPAR' echo 'graph_info This graph shows potential and active processors for a LPAR.' diff --git a/plugins/power5/weight_of_a_lpar b/plugins/power5/weight_of_a_lpar index d451972b..2d2e2b05 100755 --- a/plugins/power5/weight_of_a_lpar +++ b/plugins/power5/weight_of_a_lpar @@ -38,7 +38,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title Weight of an uncapped LPAR' echo 'graph_args -l 0' - echo 'graph_category Power5' + echo 'graph_category cpu' echo 'graph_vlabel Weight of LPAR' echo 'graph_info This graph shows the weight of an uncapped LPAR' echo 'weight.min 0' diff --git a/plugins/ftp/proftpd b/plugins/proftpd/proftpd similarity index 94% rename from plugins/ftp/proftpd rename to plugins/proftpd/proftpd index aacae81b..3b70408d 100755 --- a/plugins/ftp/proftpd +++ b/plugins/proftpd/proftpd @@ -6,7 +6,7 @@ if [ "$1" = 'config' ]; then echo "graph_args --base 1000 -l 0" echo "graph_title Serveur FTP" - echo "graph_category Ftp" + echo "graph_category ftp" echo "graph_vlabel Stats Proftpd" echo "succes.label Login succes" echo "succes.draw AREA" diff --git a/plugins/ftp/proftpd_bytes b/plugins/proftpd/proftpd_bytes similarity index 98% rename from plugins/ftp/proftpd_bytes rename to plugins/proftpd/proftpd_bytes index 85d3ef39..57875963 100755 --- a/plugins/ftp/proftpd_bytes +++ b/plugins/proftpd/proftpd_bytes @@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then echo 'graph_title FTP Server Bytes' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel FTP Server Bytes' - echo 'graph_category FTP' + echo 'graph_category ftp' echo 'ftp_get.label Bytes GET' echo 'ftp_put.label Bytes PUT' exit 0 diff --git a/plugins/ftp/proftpd_count b/plugins/proftpd/proftpd_count similarity index 97% rename from plugins/ftp/proftpd_count rename to plugins/proftpd/proftpd_count index aa9c9d3f..2d18f6b7 100755 --- a/plugins/ftp/proftpd_count +++ b/plugins/proftpd/proftpd_count @@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then echo 'graph_title FTP Server Transfers' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel FTP Server Transfers' - echo 'graph_category FTP' + echo 'graph_category ftp' echo 'ftp_get.label Files GET' echo 'ftp_put.label Files PUT' exit 0 diff --git a/plugins/ftp/pure-ftpd b/plugins/pure-ftpd/pure-ftpd similarity index 100% rename from plugins/ftp/pure-ftpd rename to plugins/pure-ftpd/pure-ftpd diff --git a/plugins/ftp/pure-ftpd-bw b/plugins/pure-ftpd/pure-ftpd-bw similarity index 100% rename from plugins/ftp/pure-ftpd-bw rename to plugins/pure-ftpd/pure-ftpd-bw diff --git a/plugins/ftp/pure-ftpd-logs b/plugins/pure-ftpd/pure-ftpd-logs similarity index 100% rename from plugins/ftp/pure-ftpd-logs rename to plugins/pure-ftpd/pure-ftpd-logs diff --git a/plugins/ftp/pureftpd_count b/plugins/pure-ftpd/pureftpd_count similarity index 97% rename from plugins/ftp/pureftpd_count rename to plugins/pure-ftpd/pureftpd_count index 93adb923..b466948a 100755 --- a/plugins/ftp/pureftpd_count +++ b/plugins/pure-ftpd/pureftpd_count @@ -30,7 +30,7 @@ if [ "$1" = "config" ]; then echo 'graph_title FTP Server' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Daily FTP Operations' - echo 'graph_category FTP' + echo 'graph_category ftp' echo 'graph_period second' echo 'ftp_put.type GAUGE' echo 'ftp_get.type GAUGE' diff --git a/plugins/ftp/pureftpd_traffic b/plugins/pure-ftpd/pureftpd_traffic similarity index 100% rename from plugins/ftp/pureftpd_traffic rename to plugins/pure-ftpd/pureftpd_traffic diff --git a/plugins/ftp/vsftpd b/plugins/vsftpd/vsftpd similarity index 100% rename from plugins/ftp/vsftpd rename to plugins/vsftpd/vsftpd diff --git a/plugins/ftp/vsftpd-rel b/plugins/vsftpd/vsftpd-rel similarity index 100% rename from plugins/ftp/vsftpd-rel rename to plugins/vsftpd/vsftpd-rel