Category Tree: reduce number of categories

plugins/2wire/2wire

@@ -66,7 +66,7 @@ graph_args --base 1000 -l 0
 #graph_vlabel number of sessions in (-) / out (+)
 graph_vlabel number of sessions
 graph_scale no
-graph_category 2wire
+graph_category network
 graph_total Total
 graph_printf %.0lf
 
@@ -84,7 +84,7 @@ graph_title 2wire NAT session type
 graph_args --base 1000 -l 0
 graph_vlabel number of sessions
 graph_scale no
-graph_category 2wire
+graph_category network
 graph_total Total
 graph_printf %.0lf
 
@@ -99,7 +99,7 @@ graph_title 2wire session uptime
 graph_args --base 1000 -l 0
 graph_vlabel Uptime in days
 graph_scale no
-graph_category 2wire
+graph_category network
 
 sessionUptime.label Uptime
 sessionUptime.draw AREA
@@ -112,7 +112,7 @@ graph_title 2wire DSL output power
 graph_args --base 1000
 graph_vlabel dBmV
 graph_scale no
-graph_category 2wire
+graph_category network
 
 powerDown.label Down
 #powerDown.graph no
@@ -124,7 +124,7 @@ graph_title 2wire DSL details
 graph_args --base 1000
 graph_vlabel dB
 graph_scale no
-graph_category 2wire
+graph_category network
 
 noiseM.label Noise margin
 attenuation.label Attenuation
@@ -136,7 +136,7 @@ graph_title 2wire Errors Time
 graph_args --base 1000
 graph_vlabel s
 graph_scale no
-graph_category 2wire
+graph_category network
 
 cumSecErrors.label Cumulative Seconds w/Errors
 cumSecSevErrors.label Cumulative Seconds w/Severe Errors
@@ -147,7 +147,7 @@ graph_title 2wire Block Correction
 graph_args --base 1000
 graph_vlabel blocks/s
 graph_scale no
-graph_category 2wire
+graph_category network
 
 correctedBlocks.label Corrected Blocks
 correctedBlocks.type DERIVE
@@ -160,7 +160,7 @@ multigraph 2wire_dsl_traffic
 graph_title 2wire DSL traffic
 graph_args --base 1024 -l 0
 graph_vlabel Bytes in (-) / out (+) per second
-graph_category 2wire
+graph_category network
 receive.label Bps
 receive.type DERIVE
 receive.min 0
@@ -176,7 +176,7 @@ multigraph 2wire_dsl_bandwidth_monthly
 graph_title 2wire DSL bandwidth usage (monthly)
 graph_args --base 1024 -l 0 -M
 graph_vlabel Bytes
-graph_category 2wire
+graph_category network
 
 down.label Down
 up.label Up
@@ -192,7 +192,7 @@ multigraph 2wire_dsl_bandwidth_weekly
 graph_title 2wire DSL bandwidth usage (weekly)
 graph_args --base 1024 -l 0 -M
 graph_vlabel Bytes
-graph_category 2wire
+graph_category network
 
 down.label Down
 up.label Up

plugins/accounting/accounting_

@@ -150,7 +150,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1024 -l 0'
 	echo 'graph_vlabel bytes per ${graph_period}'
 	echo 'graph_order tcpIN udpIN icmpIN'
-	echo 'graph_category accounting'
+	echo 'graph_category network'
 	echo 'tcpIN.label tcp received'
   echo 'tcpIN.cdef tcpIN,8,*'
 	echo 'tcpIN.type DERIVE'
@@ -172,7 +172,7 @@ if [ "$1" = "config" ]; then
   echo 'graph_args --base 1024 -l 0'
   echo 'graph_vlabel bytes per ${graph_period}'
   echo 'graph_order tcpOUT udpOUT icmpOUT'
-  echo 'graph_category accounting'
+  echo 'graph_category network'
   echo 'tcpOUT.label tcp sent'
   echo 'tcpOUT.cdef tcpOUT,8,*'
   echo 'tcpOUT.type DERIVE'

plugins/cherokee/munin-plugin-for-cherokee

@@ -93,7 +93,7 @@ def munin_values(res):
 
 def munin_config(response):
 	global type
-	print "graph_category cherokee"
+	print "graph_category webserver"
 	if type == "rate":
 		print "graph_title Cherokee Data Transfer Rate"
 		print "graph_vlabel Bits sent(+) / received(-) per ${graph_period}"

plugins/drupal/drupal_files_total.php

@@ -45,7 +45,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
   echo "graph_title Drupal Total Files\n";
   echo "graph_args --base 1000 --lower-limit 0\n";
   echo "graph_vlabel Files Count / ${graph_period}\n";
-  echo "graph_category Drupal\n";
+  echo "graph_category cms\n";
   echo "graph_scale no\n";
   echo "graph_info Displays the online files uploaded to your Drupal site\n";
 

plugins/drupal/drupal_forums_total.php

@@ -45,7 +45,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
   echo "graph_title Drupal Total Forums\n";
   echo "graph_args --base 1000 --lower-limit 0\n";
   echo "graph_vlabel Total Forums and comments Count / ${graph_period}\n";
-  echo "graph_category Drupal\n";
+  echo "graph_category cms\n";
   echo "graph_scale no\n";
   echo "graph_info Displays the sum of forums and comments made in your Drupal site\n";
 

plugins/drupal/drupal_node_distribution_count.php

@@ -55,7 +55,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
   echo "graph_title Drupal Node Distribution Count\n";
   echo "graph_args --base 1000 --lower-limit 0\n";
   echo "graph_vlabel Node Distribution Count / ${graph_period}\n";
-  echo "graph_category Drupal\n";
+  echo "graph_category cms\n";
   echo "graph_scale nol\n";
   echo "graph_info Displays the nodes content type distribution count in your Drupal site\n";
 

plugins/drupal/drupal_page_speed_test.php

@@ -65,7 +65,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
   echo "graph_title Drupal Page Speed Test\n";
   echo "graph_args --base 1000 --lower-limit 0\n";
   echo "graph_vlabel Page Load Time / ${graph_period}\n";
-  echo "graph_category Drupal\n";
+  echo "graph_category cms\n";
   echo "graph_scale no\n";
   echo "graph_info Displays the time it took for several pages to load\n";
 

plugins/drupal/drupal_users_online.php

@@ -45,7 +45,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
   echo "graph_title Drupal Online Users\n";
   echo "graph_args --base 1000 --lower-limit 0\n";
   echo "graph_vlabel Online Users Count / ${graph_period}\n";
-  echo "graph_category Drupal\n";
+  echo "graph_category cms\n";
   echo "graph_scale no\n";
   echo "graph_info Displays the online users, members and anonymous, in your Drupal site\n";
 

plugins/drupal/drupal_users_total.php

@@ -45,7 +45,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
   echo "graph_title Drupal Total Users\n";
   echo "graph_args --base 1000 --lower-limit 0\n";
   echo "graph_vlabel Total Users Count / ${graph_period}\n";
-  echo "graph_category Drupal\n";
+  echo "graph_category cms\n";
   echo "graph_scale no\n";
   echo "graph_info Displays the sum of users, as well as disabled count, in your Drupal site\n";
 

plugins/fax/faxstat

@@ -32,7 +32,7 @@ JOBTYPES="Running Waiting Done"
 if [ "$1" = "config" ]; then
         echo 'graph_title Fax Jobs'
         echo 'graph_vlabel Jobs in Queue'
-        echo 'graph_category FAX'
+        echo 'graph_category other'
         for i in $JOBTYPES; do
           echo "$i.info Number of jobs in $i queue."
           echo "$i.label $i"

plugins/fr24/fr24

@@ -39,7 +39,7 @@ case $1 in
     config)
         echo "graph_title Number of planes in sight
 graph_info Number of planes in sight with DVB-T receiver.
-graph_category fr24
+graph_category other
 graph_vlabel Number of planes
 planes.label planes"
         exit 0;;

plugins/joomla/joomla-sessions

@@ -69,7 +69,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') {
     print <<EOC
 graph_title Joomla Actual User Sessions (Totals)
 graph_vlabel Session Number
-graph_category Joomla
+graph_category cms
 anonsessions.label Anonym Sessions
 graph_scale no
 all.warning 10000

plugins/postgresql/pg__connections

@@ -66,7 +66,7 @@ if (exists $ARGV[0]) {
 		print "graph_title PostgresSQL active connections\n";
 		print "graph_args -l 0 --base 1000\n";
 		print "graph_vlabel Connections\n";
-		print "graph_category Postgresql\n";
+		print "graph_category db\n";
 		print "graph_info Shows active Postgresql connections from $dbname\n";
 
 

plugins/postgresql/pgbouncer_

@@ -64,7 +64,7 @@ if (defined($ARGV[0]))
 		print "graph_args --base 1000\n"; # numbers not bytes
 		print "graph_vlabel Average connections\n";
 		print "graph_scale no\n"; # so we do not print "micro, milli, kilo, etc"
-    		print "graph_category pgbouncer\n";
+    		print "graph_category db\n";
 		print $pool_name."_avg_req.type GAUGE\n";
 		print $pool_name."_avg_req.label Avg Req\n";
 		print $pool_name."_avg_req.min 0\n";
@@ -74,7 +74,7 @@ if (defined($ARGV[0]))
 		print "graph_title PgBouncer $plugin_title average query time\n";
 		print "graph_args --base 1000\n"; # numbers not bytes
 		print "graph_vlabel Average time per query (microseconds)\n";
-    		print "graph_category pgbouncer\n";
+    		print "graph_category db\n";
 		print $pool_name."_avg_query.type GAUGE\n";
 		print $pool_name."_avg_query.label Avg Time\n";
 		print $pool_name."_avg_query.min 0\n";
@@ -84,7 +84,7 @@ if (defined($ARGV[0]))
 		print "graph_title PgBouncer $plugin_title average bytes received/sent\n";
 		print "graph_args --base 1024\n"; # numbers in bytes
 		print "graph_vlabel Average bytes received (-)/sent (+)\n";
-    		print "graph_category pgbouncer\n";
+    		print "graph_category db\n";
 		# bytes received
 		print $pool_name."_avg_recv.type GAUGE\n";
 		print $pool_name."_avg_recv.label Avg received\n";
@@ -100,7 +100,7 @@ if (defined($ARGV[0]))
 		# pools: server (sv_)
 		print "multigraph ".$plugin_name."_pools_server\n";
 		print "graph_title PgBouncer $plugin_title servers\n";
-		print "graph_category pgbouncer\n";
+		print "graph_category db\n";
 		print "graph_args --base 1000\n"; # numbers not bytes
 		print "graph_vlabel Server connections\n";
 		print "graph_scale no\n";
@@ -132,7 +132,7 @@ if (defined($ARGV[0]))
 		# pools: client (cl_)
 		print "multigraph ".$plugin_name."_pools_client\n";
 		print "graph_title PgBouncer $plugin_title clients\n";
-		print "graph_category pgbouncer\n";
+		print "graph_category db\n";
 		print "graph_args --base 1000\n"; # numbers not bytes
 		print "graph_vlabel Client connections\n";
 		print "graph_scale no\n";
@@ -151,7 +151,7 @@ if (defined($ARGV[0]))
 		print "graph_title PgBouncer $plugin_title maximum waiting time\n";
 		print "graph_args --base 1000\n"; # numbers not bytes
 		print "graph_vlabel Maximum wait time (seconds)\n";
-    		print "graph_category pgbouncer\n";
+    		print "graph_category db\n";
 		print $pool_name."_maxwait.type GAUGE\n";
 		print $pool_name."_maxwait.label Wait Time\n";
 		print $pool_name."_maxwait.min 0\n";

plugins/postgresql/pgbouncer_client_connections

@@ -26,7 +26,7 @@ cmd="psql ${dbserver} -U ${dbuser} -p ${port} pgbouncer -tc 'SHOW POOLS;' | grep
 
 if [ "$1" = "config" ]; then
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category pgbouncer'
+	echo 'graph_category db'
 	echo 'graph_info The sum of the active and waiting clients for each pool on the server.'
 	echo 'graph_scale no'
 	echo 'graph_title PgBouncer Pool Total Client Connections'

plugins/postgresql/pgbouncer_maxwait

@@ -26,7 +26,7 @@ cmd="psql ${dbserver} -U ${dbuser} -p ${port} pgbouncer -tc 'SHOW POOLS;' | grep
 
 if [ "$1" = "config" ]; then
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category pgbouncer'
+	echo 'graph_category db'
 	echo 'graph_info PgBouncer Pool Maximum Wait'
 	echo 'graph_scale no'
 	echo 'graph_title PgBouncer Pool Maximum Wait'

plugins/postgresql/pgbouncer_server_connections

@@ -26,7 +26,7 @@ cmd="psql ${dbserver} -U ${dbuser} -p ${port} pgbouncer -tc 'SHOW POOLS;' | grep
 
 if [ "$1" = "config" ]; then
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category pgbouncer'
+	echo 'graph_category db'
 	echo 'graph_info The sum of the active and idle server connections for each pool on the server.'
 	echo 'graph_scale no'
 	echo 'graph_title PgBouncer Pool Total Server Connections'

plugins/postgresql/postgres_block_read_

@@ -128,7 +128,7 @@ if ($configure) {
 graph_title Postgres data reads from $dbname
 graph_args --base 1000
 graph_vlabel Blocks read per \${graph_period}
-graph_category Postgresql
+graph_category db 
 graph_info Shows number of blocks read from disk and from memory
 from_disk.label Read from disk
 from_disk.info Read from disk

plugins/postgresql/postgres_locks

@@ -12,7 +12,7 @@ if ($ARGV[0] && $ARGV[0] eq "config") {
 graph_title Postgres locks
 graph_args -l 0 --base 1000
 graph_vlabel Locks
-graph_category Postgresql
+graph_category db
 graph_info Shows Postgresql locks
 locks.label Locks
 locks.info Locks (more info here, please... :)

plugins/postgresql/postgres_queries2_

@@ -14,7 +14,7 @@ cat << EOF
 graph_title Postgres queries2 on $db
 graph_args --base 1000
 graph_vlabel Queries per \${graph_period}
-graph_category PostgreSQL
+graph_category db 
 graph_info Shows number of select, insert, update and delete queries
 sel_seq.label s_selects
 sel_seq.info Sequential selects on all tables

plugins/postgresql/postgres_queries3_

@@ -60,7 +60,7 @@ if( defined $ARGV[0] and $ARGV[0] eq "config" ){
 print qq/graph_title Postgres All Queries
 graph_args --base 1000 -l 0 -r
 graph_vlabel Queries per \${graph_period}
-graph_category PostgreSQL
+graph_category db 
 graph_info Shows number of select, insert, update and delete queries
 sel_seq.label s_selects
 sel_seq.info Sequential selects on all tables

plugins/postgresql/postgres_space_

@@ -80,7 +80,7 @@ if ($configure) {
 graph_title Postgres database $dbname
 graph_args -l 0 --base 1024
 graph_vlabel bytes
-graph_category Postgresql
+graph_category db
 graph_info Size
 size.label Database size (bytes)
 size.info Database size

plugins/postgresql/postgresql_active_backends

@@ -33,7 +33,7 @@ if [ "$1" = "config" ]; then
    warning=$(((maximum-reserved)*70/100))
    critical=$(((maximum-reserved)*90/100))
    echo 'graph_args --base 1000 --lower-limit 0 --upper-limit '${maximum}
-   echo 'graph_category Postgresql'
+   echo 'graph_category db'
    echo 'graph_info Shows open backends on the PostgreSQL Server.'
    echo 'graph_scale no'
    echo 'graph_title PostgreSQL Active Backends'

plugins/postgresql/postgresql_active_backends_by_database

@@ -34,7 +34,7 @@ if [ "$1" = "config" ]; then
 	critical=$(((maximum-reserved)*90/100))
 
     echo 'graph_args --base 1000 --lower-limit 0' # --upper-limit '${maximum}
-    echo 'graph_category Postgresql'
+    echo 'graph_category db'
     echo 'graph_info Shows open backends for each database on the server'
     echo 'graph_scale no'
     echo 'graph_title PostgreSQL Active Backends By Database'

plugins/postgresql/postgresql_active_locks

@@ -31,7 +31,7 @@ modes="AccessExclusive AccessShare Exclusive RowExclusive RowShare Share ShareRo
 
 if [ "$1" = "config" ]; then
    echo 'graph_args --lower-limit 0'
-   echo 'graph_category Postgresql'
+   echo 'graph_category db'
    echo 'graph_info Shows active locks on database server.'
    echo 'graph_scale no'
    echo 'graph_title PostgreSQL Active Locks'

plugins/postgresql/postgresql_database_ratio

@@ -27,7 +27,7 @@ dbuser='postgres'
 
 if [ "$1" = "config" ]; then
    echo 'graph_args --base 1000 --lower-limit 0 --upper-limit 100'
-   echo 'graph_category Postgresql'
+   echo 'graph_category db'
    echo 'graph_info Shows each database read/hit (%) on the PostgreSQL Server.'
    echo 'graph_scale no'
    echo 'graph_title PostgreSQL Database Hit/Read Ratios'

plugins/postgresql/postgresql_database_size

@@ -27,7 +27,7 @@ dbuser='postgres'
 
 if [ "$1" = "config" ]; then
    echo 'graph_args --base 1024 --lower-limit 0'
-   echo 'graph_category Postgresql'
+   echo 'graph_category db'
    echo 'graph_info Shows each database size on the PostgreSQL Server.'
    echo 'graph_title PostgreSQL Database Sizes'
    echo 'graph_vlabel Size (bytes)'

plugins/postgresql/postgresql_tablespace_size

@@ -26,7 +26,7 @@ dbuser='postgres'
 
 if [ "$1" = "config" ]; then
    echo 'graph_args --base 1024 --lower-limit 0'
-   echo 'graph_category Postgresql'
+   echo 'graph_category db'
    echo 'graph_info Shows each tablespace size on the PostgreSQL Server.'
    echo 'graph_title PostgreSQL Tablespace Sizes'
    echo 'graph_vlabel Size (bytes)'

plugins/postgresql/postgresql_transactions

@@ -26,7 +26,7 @@ dbuser='postgres'
 
 if [ "$1" = "config" ]; then
    echo 'graph_args --base 1000 --lower-limit 0'
-   echo 'graph_category Postgresql'
+   echo 'graph_category db'
    echo 'graph_info Shows summarized commits and rollbacks in transactions on the PostgreSQL Server.'
    echo 'graph_title PostgreSQL Transactions'
    echo 'graph_vlabel Number of Commits and Rollbacks'