Category Tree: reduce number of categories

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 ]

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 ]

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";
         }
         

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"

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

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

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

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

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;
 

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;
 

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;
 

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;
 

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;

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

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

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;

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;