Category Tree: Reduce number of categories

slony -> db (postgresql)
qpid -> webserver (apache)
solr -> search (solr)

plugins/apache/qpid_bytedepth

@@ -31,7 +31,7 @@ for q in queues:
       output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name))
 
 if len(sys.argv) > 1 and sys.argv[1] == "config":
-  print "graph_category Qpid";
+  print "graph_category webserver";
   print "graph_title Queue byte depth";
   print "graph_vlabel bytes"
   for queue in output_queue:

plugins/apache/qpid_discardsring

@@ -31,7 +31,7 @@ for q in queues:
       output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name))
 
 if len(sys.argv) > 1 and sys.argv[1] == "config":
-  print "graph_category Qpid";
+  print "graph_category webserver";
   print "graph_title Ring queue discard rate";
   print "graph_vlabel messages/second";
   for queue in output_queue:

plugins/apache/qpid_enqueuebytes

@@ -31,7 +31,7 @@ for q in queues:
       output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name))
 
 if len(sys.argv) > 1 and sys.argv[1] == "config":
-  print "graph_category Qpid";
+  print "graph_category webserver";
   print "graph_title Enqueue data rate";
   print "graph_vlabel bytes/second"
   for queue in output_queue:

plugins/apache/qpid_enqueuecount

@@ -31,7 +31,7 @@ for q in queues:
       output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name))
 
 if len(sys.argv) > 1 and sys.argv[1] == "config":
-  print "graph_category Qpid";
+  print "graph_category webserver";
   print "graph_title Enqueue message rate";
   print "graph_vlabel messages/second"
   for queue in output_queue:

plugins/apache/qpid_msgdepth

@@ -31,7 +31,7 @@ for q in queues:
       output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name))
 
 if len(sys.argv) > 1 and sys.argv[1] == "config":
-  print "graph_category Qpid";
+  print "graph_category webserver";
   print "graph_title Queue message depth";
   print "graph_vlabel messages"
   for queue in output_queue:

plugins/postgresql/slony_lag_events_

@@ -49,7 +49,7 @@ PGDATABASE=$(basename $0 | sed 's/^slony_lag_events_//g')
 
 if [ "$1" = "config" ]; then
     echo "graph_args --base 1000 -l 0"
-    echo "graph_category slony"
+    echo "graph_category db"
     echo "graph_info Slony st_lag_num_events for ${PGDATABASE}"
     echo "graph_title Slony lag events for ${PGDATABASE}"
     echo 'graph_vlabel event'

plugins/postgresql/slony_lag_time

@@ -49,7 +49,7 @@ PGDATABASE=$(basename $0 | sed 's/^slony_lag_time_//g')
 
 if [ "$1" = "config" ]; then
     echo "graph_args --base 1000 -l 0"
-    echo "graph_category slony"
+    echo "graph_category db"
     echo "graph_info Slony st_lag_time for ${PGDATABASE}"
     echo "graph_title Slony lag time for ${PGDATABASE}"
     echo "graph_vlabel \${graph_period}"

plugins/postgresql/slony_lag_time_

@@ -49,7 +49,7 @@ PGDATABASE=$(basename $0 | sed 's/^slony_lag_time_//g')
 
 if [ "$1" = "config" ]; then
     echo "graph_args --base 1000 -l 0"
-    echo "graph_category slony"
+    echo "graph_category db"
     echo "graph_info Slony st_lag_time for ${PGDATABASE}"
     echo "graph_title Slony lag time for ${PGDATABASE}"
     echo "graph_vlabel \${graph_period}"

plugins/solr/solr

@@ -88,7 +88,7 @@ if len(sys.argv) > 1:
         print 'graph_title Solr %s' % params['valueName']
         print 'graph_args -l 0 '
         print 'graph_vlabel Size %s' % params['valueName']
-        print 'graph_category Solr'
+        print 'graph_category search'
         print 'graph_info Info for cores: %s' % ( ",".join(params['cores']))
 
         for core in params['cores']:

plugins/solr/solr-stats

@@ -24,7 +24,7 @@ $property = $tabParams[4];
 
 if('config' === $action)
 {
-    echo 'graph_category SolR ' . $core . "\n";
+    echo 'graph_category search ' . $core . "\n";
     echo 'graph_title ' . $item . ' ' . $property . "\n";
     echo 'graph_vlabel ' . $property . "\n";
     echo $core . $item . $property . 'solr.label ' . $property . "\n";

plugins/solr/solr4_

@@ -232,7 +232,7 @@ class SolrCoreMBean:
 # Graph Templates
 
 CACHE_GRAPH_TPL = """multigraph solr_{core}_{cacheType}_hit_rates
-graph_category solr
+graph_category search
 graph_title Solr {core} {cacheName} Hit rates
 graph_order lookups hits inserts
 graph_scale no
@@ -256,7 +256,7 @@ hits.type DERIVE
 multigraph solr_{core}_{cacheType}_size
 graph_title Solr {core} {cacheName} Size
 graph_args -l 0
-graph_category solr
+graph_category search
 graph_vlabel Size
 size.label Size
 size.draw LINE2
@@ -269,7 +269,7 @@ QPSMAIN_GRAPH_TPL = """graph_title Solr {core} {handler} Request per second
 graph_args --base 1000 -r --lower-limit 0
 graph_scale no
 graph_vlabel request / second
-graph_category solr
+graph_category search
 graph_period second
 graph_order {gorder}
 {cores_qps_graphs}"""
@@ -284,7 +284,7 @@ REQUESTTIMES_GRAPH_TPL = """multigraph {core}_requesttimes
 graph_title Solr {core} {handler} Time per request
 graph_args -l 0
 graph_vlabel millis
-graph_category solr
+graph_category search
 savgtimeperrequest_{core}.label {core} Avg time per request
 savgtimeperrequest_{core}.type GAUGE
 savgtimeperrequest_{core}.graph yes
@@ -299,12 +299,12 @@ s99thpcrequesttime_{core}.graph yes
 NUMDOCS_GRAPH_TPL = """graph_title Solr Docs %s
 graph_vlabel docs
 docs.label Docs
-graph_category solr"""
+graph_category search"""
 
 INDEXSIZE_GRAPH_TPL = """graph_args --base 1024 -l 0 
 graph_vlabel Bytes
 graph_title Index Size
-graph_category solr
+graph_category search
 graph_info Solr Index Size.
 graph_order {cores}
 {cores_config}
@@ -318,7 +318,7 @@ INDEXSIZECORE_GRAPH_TPL = """{core}.label {core}
 MEMORYUSAGE_GRAPH_TPL = """graph_args --base 1024 -l 0 --upper-limit {availableram}
 graph_vlabel Bytes
 graph_title Solr memory usage
-graph_category solr
+graph_category search
 graph_info Solr Memory Usage.
 used.label Used
 max.label Max

plugins/solr/solrmulticore

@@ -158,7 +158,7 @@ if len(sys.argv) > 1:
         print 'graph_title %s' % ( PLUGINOPTIONSLIST[params['valueName']]['label'] )
         print "graph_args --base 1000";
         print 'graph_vlabel Size %s' % params['valueName']
-        print 'graph_category Solr'
+        print 'graph_category search'
         print 'graph_info Info for cores: %s' % ( ",".join(params['cores']) )
 
         # Iterations for core datas

plugins/solr/wfsolr_

@@ -170,7 +170,7 @@ try
 		{
 			echo "graph_args --base 1024 -l 0\n";
 		}
-		echo "graph_category Solr $core\n";
+		echo "graph_category search $core\n";
 		echo "graph_title $item $property\n";
 		echo "graph_vlabel $property\n";
 		if ($core !== null)