Merge branch 'categories'

Category Tree: Reduce number of categories

plugins/newznab/nn_

@@ -218,7 +218,7 @@ sub config {
     while (my ($k, $v) = each %conf) {
 	print "graph_$k $v\n";
     }
-    print "graph_category newznab\n";
+    print "graph_category search\n";
 
     my $i = 0;
     for my $ds (@{$graph->{data_sources}}) {

plugins/ossec/ossec_active_response

@@ -9,7 +9,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title OSSEC Active Response"
 	echo "graph_args --base 1000 -l 0"
 	echo "graph_vlabel Number of responses"
-	echo "graph_category ossec"
+	echo "graph_category security"
 	echo "graph_scale no"
 	echo "c_add_actions.label rules added"
 	echo "c_add_actions.draw LINE2"

plugins/ossec/ossec_agents

@@ -9,7 +9,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Ossec agents status"
 	echo "graph_args --base 1000 -l 0"
 	echo "graph_vlabel Number of ossec agents"
-	echo "graph_category ossec"
+	echo "graph_category security"
 	echo "graph_scale no"
 	echo "active.label active"
 	echo "active.draw LINE2"

plugins/ossec/ossec_alerts

@@ -9,7 +9,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Ossec alerts per service"
 	echo "graph_args --base 1000 -l 0"
 	echo "graph_vlabel Number of alerts per service"
-	echo "graph_category ossec"
+	echo "graph_category security"
 	echo "graph_scale no"
 	echo "apache.label httpd"
 	echo "apache.draw LINE2"

plugins/php/hhvm_

@@ -89,7 +89,7 @@ if ( exists $ARGV[0] && 'config' eq $ARGV[0] ) {
 multigraph hhvm_${graphName}_threads
 graph_title HHVM Threads ${name}
 graph_args --base 1000
-graph_category php
+graph_category webserver
 threads.label Threads
 load.label Active Workers
 queued.label Queued Jobs
@@ -97,7 +97,7 @@ queued.label Queued Jobs
 multigraph hhvm_${graphName}_sizes
 graph_title HHVM Sizes ${name}
 graph_args --base 1024
-graph_category php
+graph_category webserver
 hhbc-roarena-capac.label HHBC Arena Capacity
 tc-hotsize.label TC Hot Size
 tc-hotsize.info Translation Cache Hot Size

plugins/powermta/pmta_

@@ -225,7 +225,7 @@ case $1 in
 	;;
 	config)
 		if [ -n "$CONF_TITLE" ] && [ -n "$CONF_LABEL" ]; then
-			echo "graph_category PowerMTA"
+			echo "graph_category mail"
 			echo "graph_title $CONF_TITLE on ${REMOTEHOST}"
 			echo "graph_vlabel $CONF_LABEL"
 			echo "graph_scale yes"

plugins/qpsmtpd/qpsmtpd_mailstats

@@ -96,7 +96,7 @@ sub do_config {
     my $k;
 
     print "graph_title QPSMTPD Responses
-graph_category QPSMTPD
+graph_category mail
 graph_args --base 1000 -l 0
 graph_vlabel responses / \${graph_period}
 graph_scale  no

plugins/uwsgi/uwsgi_

@@ -21,7 +21,7 @@ if [ "$mode" = "memory" ]; then
         if [ "$1" = "config" ]; then
                 echo "graph_title Total uWSGI Memory"
                 echo "graph_vlabel Total RAM"
-                echo "graph_category uWSGI"
+                echo "graph_category appserver"
                 echo "graph_args --base 1024"
                 echo "ram.label Total RAM"
                 exit 0
@@ -42,7 +42,7 @@ elif [ "$mode" = "processes" ]; then
         if [ "$1" = "config" ]; then
                 echo "graph_title uWSGI Processes"
                 echo "graph_vlabel Processes"
-                echo "graph_category uWSGI"
+                echo "graph_category appserver"
                 echo "processes.label active processes"
         else
                 echo -n "processes.value "
@@ -55,7 +55,7 @@ elif [ "$mode" = "average" ]; then
         echo 'graph_title uWSGI Average Process Size'
         echo 'graph_args --base 1024 -l 0 '
         echo 'graph_vlabel Average Process Size'
-        echo 'graph_category uWSGI'
+        echo 'graph_category appserver'
         echo 'uwsgi_average.label Average Process Size'
         echo 'uwsgi_average.draw LINE2'
         echo 'uwsgi_average.info The average process size for uWSGI'

plugins/zimbra/zimbra-mailboxsizes

@@ -58,7 +58,7 @@ if [ "$1" = "config" ]; then
   echo 'graph_args --base 1024 -l 0 '
   echo 'graph_scale yes'
   echo 'graph_vlabel Mailboxsize'
-  echo 'graph_category Zimbra'
+  echo 'graph_category mail'
   /opt/zimbra/bin/zmprov gqu $(hostname)|awk '$3>102400 {sub (/@.*/, "",$1); sub(/\./, "_" ,$1); print $1".label "$1}'
   exit 0
 fi

plugins/znc/znc_logs.py

@@ -152,7 +152,7 @@ def read_data(savestate=True):
 
 def emit_config():
     print('graph_title Lines in the ZNC-log')
-    print('graph_category znc')
+    print('graph_category chat')
     print('graph_vlabel lines / ${graph_period}')
     print('graph_scale no')
     print('graph_args --base 1000 --lower-limit 0')

plugins/zope/zeo_monitor_

@@ -136,7 +136,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config") {
 graph_title ZEO $mode for storage $storage_name
 graph_args --base 1000 --lower-limit 0
 graph_vlabel events per \${graph_period}
-graph_category zeo
+graph_category appserver
 graph_info ZEO performance monitoring
 EOF