Merge branch 'categories'

Category Tree: Reduce number of categories

plugins/mod_jk/mod_jk

@@ -26,7 +26,7 @@ then
 	# Status graph
 	echo "multigraph mod_jk_status"
 	echo "graph_title mod_jk Status"
-	echo "graph_category tomcat"
+	echo "graph_category webserver"
 	echo "graph_info This graph shows the status of the different mod_jk nodes."
 	echo "graph_vlabel Status"
 
@@ -43,7 +43,7 @@ then
         do
         	echo "multigraph mod_jk_requests_$i"
         	echo "graph_title mod_jk Requests $i"
-        	echo "graph_category tomcat"
+          echo "graph_category webserver"
         	echo "graph_info This graph shows the status of requests to the mod_jk node: $i"
         	echo "graph_vlabel Request"
                 echo "busy.label Current"
@@ -59,7 +59,7 @@ then
         do
                 echo "multigraph mod_jk_traffic_$i"
                 echo "graph_title mod_jk Traffic $i"
-                echo "graph_category tomcat"
+                echo "graph_category webserver"
                 echo "graph_info This graph shows the traffic statistics to the mod_jk node: $i"
                 echo "graph_vlabel Bytes/min"
                 echo "transferred.label Write to node (bytes/min)"

plugins/nagios/nagiosstatus

@@ -54,7 +54,7 @@ if ($ARGV[0]) {
   } elsif ($ARGV[0] eq "config") {
     print "graph_args --base 1000 -l 0 --vertical-label Checks\n";
     print "graph_title Nagios status\n";
-    print "graph_category Nagios\n";
+    print "graph_category munin\n";
     print "graph_info This graph shows how many Nagios checks are in warning or critical state.\n";
     print "graph_order hdown hunknown swarning scritical sunknown\n";
     print "hdown.label Hosts down\n";

plugins/radiator/radiator_acct_lag

@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title Radiator ACCT response lag'
 	echo 'graph_vlabel time'
 	echo 'graph_args -l 0'
-	echo 'graph_category radiator'
+	echo 'graph_category auth'
 	echo 'graph_info This graph displayes ACCT response lag of all radiator processes combined.'
 	#
 	# Count all statistics files and create labels

plugins/radiator/radiator_acct_ppm

@@ -36,7 +36,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_period minute'
 	echo 'graph_vlabel packets per minute'
 	echo 'graph_args -l 0'
-	echo 'graph_category radiator'
+	echo 'graph_category auth'
 	echo 'graph_info This graph displays ACCT packets of all radiator processes combined.'
 	#
 	# Count all statistics files and create labels

plugins/radiator/radiator_auth_lag

@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title Radiator AUTH response lag'
 	echo 'graph_vlabel time'
 	echo 'graph_args -l 0'
-	echo 'graph_category radiator'
+	echo 'graph_category auth'
 	echo 'graph_info This graph displayes AUTH response lag of all radiator processes combined.'
 	#
 	# Count all statistics files and create labels

plugins/radiator/radiator_auth_ppm

@@ -36,7 +36,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_period minute'
 	echo 'graph_vlabel packets per minute'
 	echo 'graph_args -l 0'
-	echo 'graph_category radiator'
+	echo 'graph_category auth'
 	echo 'graph_info This graph displayes AUTH packets of all radiator processes combined.'
 	#
 	# Count all statistics files and create labels

plugins/tomcat/tomcat_access

@@ -94,7 +94,7 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
     print "graph_title Tomcat accesses\n";
     print "graph_args --base 1000\n";
     print "graph_vlabel accesses / \${graph_period}\n";
-    print "graph_category tomcat\n";
+    print "graph_category webserver\n";
     print "accesses.label Accesses\n";
     print "accesses.type DERIVE\n";
     print "accesses.max 1000000\n";

plugins/ups/apcupsd_pct

@@ -64,7 +64,7 @@ sub decide_monitor_type {
     # common
     %Graph = (
         graph_title => "APC Status".($UPS_MODEL?" ($UPS_MODEL)":"")." - ",
-        graph_category => "ups",
+        graph_category => "sensors",
         graph_info     => "This graph shows information about your APC UPS",
         graph_args     => "--base 1000 --lower-limit 0",
        );

plugins/ups/apcupsd_ww

@@ -204,7 +204,7 @@ if (defined $ARGV[0] && $ARGV[0] eq 'config') {
 		print "graph_title $data{MODEL}\n";
 	}
 	#print "graph_vlabel Units\n";
-	print "graph_category ups\n";
+	print "graph_category sensors\n";
 	print "graph_info This graph shows information about your APC uninterruptible power supply.\n";
 
 	foreach my $what (sort keys %attrs) {

plugins/ups/snmp__apc_ups

@@ -463,7 +463,7 @@ sub emit_config {
 
     say "graph_title ".( $title{$graph} || "Untitled /$graph/");
     say process_oids( "graph_vlabel " . $vlabel{$graph}, $values );
-    say "graph_category UPS";
+    say "graph_category sensors";
     say process_oids( "graph_info " . $info{$graph}, $values );
 
     foreach my $label (keys %{ $label{$graph} } ) {