From ff883dee022bdcfdaa873c5783730c4f420a5de4 Mon Sep 17 00:00:00 2001
From: dipohl <contact@dipohl.de>
Date: Wed, 22 Feb 2017 05:34:14 +0100
Subject: [PATCH] Category Tree: reduce number of categories

---
 plugins/gpu/amd_gpu_                        | 10 +++++-----
 plugins/gpu/nvidia_gpu_                     |  6 +++---
 plugins/gpu/nvidia_smi_                     |  2 +-
 plugins/{mail => imapproxy}/imapproxy_multi |  4 ++--
 plugins/ipvs/ipvs_active                    |  2 +-
 plugins/ipvs/ipvs_bps                       |  2 +-
 plugins/ipvs/ipvs_conn                      |  2 +-
 plugins/ipvs/ipvs_cps                       |  2 +-
 plugins/lustre/lustre_df                    |  2 +-
 plugins/lustre/lustre_df_abs                |  2 +-
 plugins/lustre/lustre_df_absfree            |  2 +-
 plugins/lustre/lustre_df_inodes             |  2 +-
 plugins/lxc/lxc_cpu                         |  2 +-
 plugins/lxc/lxc_cpu_time                    |  2 +-
 plugins/lxc/lxc_net                         |  2 +-
 plugins/lxc/lxc_proc                        |  2 +-
 plugins/lxc/lxc_ram                         |  2 +-
 17 files changed, 24 insertions(+), 24 deletions(-)
 rename plugins/{mail => imapproxy}/imapproxy_multi (97%)

diff --git a/plugins/gpu/amd_gpu_ b/plugins/gpu/amd_gpu_
index 4f7095e0..b2fd4500 100755
--- a/plugins/gpu/amd_gpu_
+++ b/plugins/gpu/amd_gpu_
@@ -111,7 +111,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU temperature'
 			echo 'graph_args -l 0 -u 120'
 			echo 'graph_vlabel Degrees (C)'
-			echo 'graph_category gpu'
+			echo 'graph_category sensors'
 			echo "graph_info Temperature information for AMD GPUs"
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
@@ -138,7 +138,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU clock'
 			echo "graph_args -l 0 -u $maxclock"
 			echo 'graph_vlabel MHz'
-			echo 'graph_category gpu'
+			echo 'graph_category sensors'
 			echo "graph_info Core and memory clock info for AMD GPUs"
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
@@ -155,7 +155,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU fan speed'
 			echo 'graph_args -l 0 -u 100'
 			echo 'graph_vlabel Percentage'
-			echo 'graph_category gpu'
+			echo 'graph_category sensors'
 			echo "graph_info Fan speed of AMD GPUs"
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
@@ -170,7 +170,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU load'
 			echo 'graph_args -l 0 -u 100'
 			echo 'graph_vlabel Percentage'
-			echo 'graph_category gpu'
+			echo 'graph_category sensors'
 			echo "graph_info GPU load"			
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
@@ -184,7 +184,7 @@ if [ "$1" = "config" ]; then
 		vcore)
 			echo 'graph_title GPU core voltage'
 			echo 'graph_vlabel mV'
-			echo 'graph_category gpu'
+			echo 'graph_category sensors'
 			echo "graph_info GPU core voltage"
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
diff --git a/plugins/gpu/nvidia_gpu_ b/plugins/gpu/nvidia_gpu_
index 56741504..ea245f79 100755
--- a/plugins/gpu/nvidia_gpu_
+++ b/plugins/gpu/nvidia_gpu_
@@ -113,7 +113,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU temperature'
 			echo 'graph_args -l 0 -u 120'
 			echo 'graph_vlabel Degrees (C)'
-			echo 'graph_category gpu'
+			echo 'graph_category sensors'
 			echo "graph_info Temperature information for NVIDIA GPUs using driver version $driverVersion"
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
@@ -145,14 +145,14 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU memory usage'
 			echo 'graph_args -l 0 -u 100'
 			echo 'graph_vlabel Percentage'
-			echo 'graph_category gpu'
+			echo 'graph_category memory'
 			echo "graph_info FB Memory usage for NVIDIA GPUs using driver version $driverVersion (total memory is $gpusTotalMem)"
 			;;
 		fan)
 			echo 'graph_title GPU fan speed'
 			echo 'graph_args -l 0 -u 100'
 			echo 'graph_vlabel Percentage'
-			echo 'graph_category gpu'
+			echo 'graph_category sensors'
 			echo "graph_info Fan speed of NVIDIA GPUs using driver version $driverVersion"
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
diff --git a/plugins/gpu/nvidia_smi_ b/plugins/gpu/nvidia_smi_
index f57b763d..f5395d5e 100755
--- a/plugins/gpu/nvidia_smi_
+++ b/plugins/gpu/nvidia_smi_
@@ -75,7 +75,7 @@ for (my $i = 0; $i < $gpuCount; $i++)
             print "graph_title GPU\n";
             print "graph_args --upper-limit 120 -l 0\n";
             print "graph_vlabel Percent or Degrees C\n";
-            print "graph_category GPU\n";
+            print "graph_category sensors\n";
             print "graph_info Information for NVIDIA GPUs using driver version $driverVersion\n";
         }
         
diff --git a/plugins/mail/imapproxy_multi b/plugins/imapproxy/imapproxy_multi
similarity index 97%
rename from plugins/mail/imapproxy_multi
rename to plugins/imapproxy/imapproxy_multi
index e056f6b0..12afc642 100755
--- a/plugins/mail/imapproxy_multi
+++ b/plugins/imapproxy/imapproxy_multi
@@ -46,7 +46,7 @@ def print_config():
     print "graph_args -l 0 --base 1000"
     print "graph_total total"
     print "graph_vlabel Cache Connections / ${graph_period}"
-    print "graph_category imapproxy"
+    print "graph_category mail"
     print "cache_hits.draw AREA"
     print "cache_hits.type DERIVE"
     print "cache_hits.label Cache Hits"
@@ -61,7 +61,7 @@ def print_config():
     print "graph_args -l 0 --base 1000"
     print "graph_total total"
     print "graph_vlabel Connections / ${graph_period}"
-    print "graph_category imapproxy"
+    print "graph_category mail"
     print "connections_reused.draw AREA"
     print "connections_reused.type DERIVE"
     print "connections_reused.label Reused Connections"
diff --git a/plugins/ipvs/ipvs_active b/plugins/ipvs/ipvs_active
index b9e37973..c6fd9255 100755
--- a/plugins/ipvs/ipvs_active
+++ b/plugins/ipvs/ipvs_active
@@ -45,7 +45,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0 '
         echo 'graph_vlabel Servers'
         echo 'graph_scale no'
-        echo 'graph_category Ipvs'
+        echo 'graph_category loadbalancer'
         echo 'graph_info Indicate the number of active servers in Ipvs.'
 
 	for IP in $IPLIST; do
diff --git a/plugins/ipvs/ipvs_bps b/plugins/ipvs/ipvs_bps
index df198ce3..70e045e3 100755
--- a/plugins/ipvs/ipvs_bps
+++ b/plugins/ipvs/ipvs_bps
@@ -44,7 +44,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title Ipvs Traffic'
         echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Bytes in (-) / out (+)'
-        echo 'graph_category Ipvs'
+        echo 'graph_category loadbalancer'
         echo 'graph_info Indicate the ipvs traffic.'
 
 	for IP in $IPLIST; do
diff --git a/plugins/ipvs/ipvs_conn b/plugins/ipvs/ipvs_conn
index ce5dc922..fb480b92 100755
--- a/plugins/ipvs/ipvs_conn
+++ b/plugins/ipvs/ipvs_conn
@@ -45,7 +45,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0 '
         echo 'graph_vlabel Connections'
         echo 'graph_scale no'
-        echo 'graph_category Ipvs'
+        echo 'graph_category loadbalancer'
         echo 'graph_info Indicate the number of active and inactive connections in Ipvs.'
 
 	for IP in $IPLIST; do
diff --git a/plugins/ipvs/ipvs_cps b/plugins/ipvs/ipvs_cps
index 10081cee..ada252e5 100755
--- a/plugins/ipvs/ipvs_cps
+++ b/plugins/ipvs/ipvs_cps
@@ -45,7 +45,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0 '
         echo 'graph_vlabel Connections'
         echo 'graph_scale no'
-        echo 'graph_category Ipvs'
+        echo 'graph_category loadbalancer'
         echo 'graph_info Indicate the number of connections per second.'
 
 	for IP in $IPLIST; do
diff --git a/plugins/lustre/lustre_df b/plugins/lustre/lustre_df
index 6836571b..86913419 100755
--- a/plugins/lustre/lustre_df
+++ b/plugins/lustre/lustre_df
@@ -49,7 +49,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") {
     print "graph_args --base 1000\n";
     print "graph_vlabel % usage\n";
     print "graph_scale no\n";
-    print "graph_category lustre\n";
+    print "graph_category fs\n";
 
     &print_labels;
 
diff --git a/plugins/lustre/lustre_df_abs b/plugins/lustre/lustre_df_abs
index a9395944..fb9bc400 100755
--- a/plugins/lustre/lustre_df_abs
+++ b/plugins/lustre/lustre_df_abs
@@ -49,7 +49,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") {
     print "graph_title Lustre cluster storage objects usage in TB\n";
     print "graph_args --base 1024 --lower-limit 0\n";
     print "graph_vlabel TB\n";
-    print "graph_category lustre\n"; 
+    print "graph_category fs\n"; 
     
     &print_labels;
 
diff --git a/plugins/lustre/lustre_df_absfree b/plugins/lustre/lustre_df_absfree
index 0160930e..3681cb14 100755
--- a/plugins/lustre/lustre_df_absfree
+++ b/plugins/lustre/lustre_df_absfree
@@ -49,7 +49,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") {
     print "graph_title Lustre cluster storage objects free space in TB\n";
     print "graph_args --base 1024 --lower-limit 0\n";
     print "graph_vlabel TB\n";
-    print "graph_category lustre\n"; 
+    print "graph_category fs\n"; 
     
     &print_labels;
 
diff --git a/plugins/lustre/lustre_df_inodes b/plugins/lustre/lustre_df_inodes
index e332060c..35626187 100755
--- a/plugins/lustre/lustre_df_inodes
+++ b/plugins/lustre/lustre_df_inodes
@@ -49,7 +49,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") {
     print "graph_args --base 1000\n";
     print "graph_vlabel % usage\n";
     print "graph_scale no\n";
-    print "graph_category lustre\n";
+    print "graph_category fs\n";
 
     &print_labels;
 
diff --git a/plugins/lxc/lxc_cpu b/plugins/lxc/lxc_cpu
index d8cbe9e1..87947c74 100755
--- a/plugins/lxc/lxc_cpu
+++ b/plugins/lxc/lxc_cpu
@@ -61,7 +61,7 @@ if [ "$1" = "config" ]; then
  echo 'graph_title CPU Usage '
  echo 'graph_args -l 0 --base 1000'
  echo 'graph_vlabel USER_HZ'
- echo 'graph_category lxc'
+ echo 'graph_category cpu'
 
  
  for guest_name in $guest_names;
diff --git a/plugins/lxc/lxc_cpu_time b/plugins/lxc/lxc_cpu_time
index 8a1d048c..22a5e1f8 100755
--- a/plugins/lxc/lxc_cpu_time
+++ b/plugins/lxc/lxc_cpu_time
@@ -60,7 +60,7 @@ if [ "$1" = "config" ]; then
  echo 'graph_title CPU time '
  echo 'graph_args -l 0 --base 1000'
  echo 'graph_vlabel nanosec'
- echo 'graph_category lxc'
+ echo 'graph_category cpu'
 
  for guest_name in $guest_names;
   do
diff --git a/plugins/lxc/lxc_net b/plugins/lxc/lxc_net
index 319a92cb..872147a7 100755
--- a/plugins/lxc/lxc_net
+++ b/plugins/lxc/lxc_net
@@ -84,7 +84,7 @@ if [ "$1" = "config" ]; then
     echo "graph_title Network traffic"
     echo "graph_args --base 1000"
     echo "graph_vlabel bits in (-) / out (+) per ${graph_period}"
-    echo "graph_category lxc"
+    echo "graph_category network"
     echo "graph_info This graph shows the traffic of active LXC containers."
     
     for guestname in $actives; do
diff --git a/plugins/lxc/lxc_proc b/plugins/lxc/lxc_proc
index d9cd1636..c2e3b02d 100755
--- a/plugins/lxc/lxc_proc
+++ b/plugins/lxc/lxc_proc
@@ -93,7 +93,7 @@ if [ "$1" = "config" ]; then
  echo 'graph_title Processes '
  echo 'graph_args -l 0 --base 1000'
  echo 'graph_vlabel Number of processes'
- echo 'graph_category lxc'
+ echo 'graph_category processes'
 
  
  for guest_name in $guest_names;
diff --git a/plugins/lxc/lxc_ram b/plugins/lxc/lxc_ram
index 1d61b2c9..db770778 100755
--- a/plugins/lxc/lxc_ram
+++ b/plugins/lxc/lxc_ram
@@ -60,7 +60,7 @@ if [ "$1" = "config" ]; then
  echo 'graph_title Memory '
  echo 'graph_args -l 0 --base 1024'
  echo 'graph_vlabel byte'
- echo 'graph_category lxc'
+ echo 'graph_category memory'
 
 
  for guest_name in $guest_names;