Reduce number of categories, use more generic terms

plugins/bind9/bind9_rr

@@ -108,7 +108,7 @@ sub do_config {
     my $k;
 
     print "graph_title DNS Queries by RR
-graph_category BIND
+graph_category dns
 graph_vlabel Queries / \${graph_period}
 ";
     get_state;

plugins/boinc/boinc_processes

@@ -98,6 +98,7 @@ sub config {
   while (chomp($reply = <$client>) && ($reply ne "</boinc_gui_rpc_reply>")) {
     if ($reply =~ /<domain_name>(.*)<\/domain_name>/) {
       print "graph_title BOINC task progress [$1]\n";
+      print "graph_category boinc\n";
       print "graph_args -l 0\n";
       print "graph_vlabel %\n";
     }  

plugins/disk/xfs

@@ -99,7 +99,7 @@ foreach my $func ( keys %config ) {
     print "graph_title $config{$func}->{title}\n";
     print "graph_args --base 1000\n";
     print "graph_vlabel $config{$func}->{vtitle}\n";
-    print "graph_category XFS\n";
+    print "graph_category filesystem\n";
     my $iter = 0;
     foreach my $param (@{$config{$func}->{params}}) {
       print "$param.type DERIVE\n";

plugins/disk/xfs_frag

@@ -40,7 +40,7 @@ case $1 in
 		cat <<'EOF'	
 graph_title XFS fragmentation
 graph_vlabel Percent
-graph_category disk
+graph_category filesystem 
 EOF
 		cat /etc/mtab | awk '{print $2 " " $3}' | while read LINE
 		do

plugins/dxtv/hadoop-under_replicated-blocks

@@ -8,7 +8,7 @@ case $1 in
    config)
         cat <<'EOM'
 graph_title Under Replicated Blocks Hadoop
-graph_category Dxtv
+graph_category hadoop
 graph_vlabel block
 block.label block
 EOM

plugins/ftp/pure-ftpd-bw

@@ -54,7 +54,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title Pure Ftpd Bandwidth'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Datas sent / received'
-        echo 'graph_category pure-ftpd'
+        echo 'graph_category ftp'
         echo 'dl.label Bytes downloaded'
         echo 'ul.label Bytes uploaded'
         exit 0

plugins/ftp/pure-ftpd-logs

@@ -44,7 +44,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title Pure Ftpd Logs'
 	echo 'graph_args --base 1000 -l 0'
 	echo 'graph_vlabel Connections number'
-	echo 'graph_category pure-ftp'
+	echo 'graph_category ftp'
 	echo 'nc.label new connection'
 	echo 'al.label anonymous logged'
 	echo 'ul.label auth user logged'

plugins/ftp/pureftpd_traffic

@@ -23,7 +23,7 @@ if ($ARGV[0] eq "test") {
 
 if ($ARGV[0] eq "config") {
  $out.="graph_title pureftpd traffic
-graph_category PureFTPd
+graph_category ftp
 graph_info This graph shows pureftpd traffic.
 graph_vlabel Bytes
 get.label Get

plugins/google/google-rank

@@ -55,7 +55,7 @@ if [ "$1" = "config" ]; then
    iLoop=1
    echo 'graph_title Google page rank'
    echo 'graph_args --upper-limit 100 -l 0'
-   echo 'graph_category other'
+   echo 'graph_category google'
    echo 'graph_scale no'
    echo 'graph_info Google page rank for URLs & Words'
 

plugins/mail/postfwd2

@@ -214,7 +214,7 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq 'config') ) {
                 print 'graph_vlabel ', $graphs{$key}->{vlabel}, "\n";
                 print 'graph_width 600', "\n";
                 print 'graph_args --lower-limit 0 ', $args, "\n";
-                print 'graph_category others', "\n";
+                print 'graph_category other', "\n";
                 print $label, '.label ', $graphs{$key}->{series}->{$label}->{label}, "\n";
                 print $label, '.draw LINE', "\n";
                 print $label, '.type GAUGE', "\n";

plugins/mysql/mysql-schema-size

@@ -28,7 +28,7 @@ while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 if($argc > 1 && $argv[1] == 'config') {
   $text = <<<EOT
 graph_title $dbname Schema Size
-graph_category mysql_schema_size_$dbname
+graph_category mysql
 graph_vlabel Size
 graph_args --base 1024 -l 0
 $text

plugins/mysql/mysql-table-size

@@ -30,7 +30,7 @@ EOT;
 if($argc > 1 && $argv[1] == 'config') {
   $text = <<<EOT
 graph_title $dbname Table Data Size
-graph_category mysql_table_size_$dbname
+graph_category mysql
 graph_vlabel Size
 graph_args --base 1024 -l 0
 $text

plugins/printer/xerox-wc3220

@@ -35,7 +35,7 @@ config)
 
 echo "graph_title Consumables level @ $PRINTER_IP"
 echo 'graph_vlabel %'
-echo 'graph_category printers'
+echo 'graph_category printer'
 echo 'graph_scale no'
 echo 'black.label Black toner level'
 echo 'black.draw LINE2'

plugins/printer/xerox-wc7232-consumables

@@ -35,7 +35,7 @@ config)
 
 echo "graph_title Consumables level @ $PRINTER_IP"
 echo 'graph_vlabel %'
-echo 'graph_category printers'
+echo 'graph_category printer'
 echo 'graph_scale no'
 echo 'cyan.label Cyan toner level'
 echo 'cyan.draw LINE2'

plugins/snmp/snmp__netapp_ops

@@ -85,7 +85,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host OPS \n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel OPS \n";
-    print "graph_category OPS\n";
+    print "graph_category netapp\n";
     print "graph_info This graph shows OPS for the $host NetApp equipment.\n";
     print "graph_order misc64CifsOps misc64NfsOps iscsi64Ops fcp64Ops misc64HttpOps\n";
     foreach my $k (sort keys %config)

plugins/virtualization/vmware/esxi

@@ -139,7 +139,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_args -l 0'
 			echo 'graph_scale no'
 			echo 'graph_vlabel CPU usage in MHz'
-			echo 'graph_category esx'
+			echo 'graph_category Virtualization'
 			echo 'graph_info This graph shows the average CPU MHz used by each domain'
 
 			name="Domain_0"
@@ -176,7 +176,7 @@ EOF
 			echo 'graph_args -l 0'
 			echo 'graph_scale no'
 			echo 'graph_vlabel Memory usage in Megabytes'
-			echo 'graph_category esx'
+			echo 'graph_category Virtualization'
 			echo 'graph_info This graph shows the average Memory used by each domain'
 
 			name="Domain_0"

plugins/yacy/yacy

@@ -113,7 +113,7 @@ if ($ARGV[0] and $ARGV[0] eq "config")
 	print <<EOF;
 graph_title $titles->{$action}
 graph_info $titles->{$action}
-graph_category YaCy
+graph_category search
 EOF
 	if ($action =~ /network_(peers|documents)/) {
 		print <<EOF;

plugins/zfs/zfs-filesystem-graph

@@ -41,7 +41,7 @@ if [ "$1" = "config" ]; then
 graph_order usedbydataset usedbychildren usedbysnapshots usedbyrefreservation available total quota
 graph_args --base 1024 -r -l 0 --vertical-label Bytes --upper-limit ${values[6]}
 graph_info This graph shows how is used a zfs filesystems.
-graph_category Zfs
+graph_category filesystem
 graph_period second
 usedbydataset.label UsedByDataset
 usedbydataset.draw AREA

plugins/zfs/zfs-stats-for-freebsd-arc-efficiency

@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Efficiency'
     echo 'graph_args -l 0'
     echo 'graph_vlabel %'
-    echo 'graph_category ZFS'
+    echo 'graph_category filesystem'
     echo 'graph_info This graph shows the ARC Efficiency'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /Efficiency/ {print}' | \
@@ -51,4 +51,4 @@ fi
 # /usr/local/bin/zfs-stats and processes its output
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /Efficiency/ {print}' | \
-awk '/^\t.*%/ {sub("\t","");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print $1".value "$2}'
+awk '/^\t.*%/ {sub("\t","");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print $1".value "$2}'

plugins/zfs/zfs-stats-for-freebsd-arc-utilization

@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Size'
     echo 'graph_args -l 0'
     echo 'graph_vlabel Size in MB'
-    echo 'graph_category ZFS'
+    echo 'graph_category filesystem'
     echo 'graph_info This graph shows the ARC Size utilization'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /^ARC Size/ {print}' | \

plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list

@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Cache Hits by Cache List'
     echo 'graph_args  -l 0'
     echo 'graph_vlabel %'
-    echo 'graph_category ZFS'
+    echo 'graph_category filesystem'
     echo 'graph_info This graph shows the ARC cache hits by cache list'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /CACHE HITS BY CACHE LIST/ {print}' | \

plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type

@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Cache Hits and Misses'
     echo 'graph_args --upper-limit 100 -l -100'
     echo 'graph_vlabel %'
-    echo 'graph_category ZFS'
+    echo 'graph_category filesystem'
     echo 'graph_info This graph shows the ARC cache hits and misses by data type'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /HITS BY DATA TYPE/ {print}' | \
@@ -55,4 +55,4 @@ fi
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /HITS BY DATA TYPE/ {print}' | \
 awk '/^\t.*%/ {sub(/[\t ]*/,"");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print "hits_"$1".value "$2}'
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /MISSES BY DATA TYPE/ {print}' | \
-awk '/^\t.*%/ {sub(/[\t ]*/,"");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print "misses_"$1".value -"$2}'
+awk '/^\t.*%/ {sub(/[\t ]*/,"");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print "misses_"$1".value -"$2}'

plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch

@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS DMU prefech stats'
     echo 'graph_args --upper-limit 100 -l -100'
     echo 'graph_vlabel %'
-    echo 'graph_category ZFS'
+    echo 'graph_category filesystem'
     echo 'graph_info This graph shows the DMU prefech stats'
 
 /usr/local/bin/zfs-stats -Z | awk '/Hit Ratio/ {sub(/[\t ]*/,"");sub(/:.*/,""); displayname = $0; gsub(/[ .]/,"_",$0); print $0".label "displayname"\n"$0".min 0"}' 
@@ -51,4 +51,4 @@ fi
 # /usr/local/bin/zfs-stats and processes its output
 
 /usr/local/bin/zfs-stats -Z | awk '/Hit Ratio/ {sub(/[\t ]*/,"");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print $1".value "$2}'
-/usr/local/bin/zfs-stats -Z | awk '/Miss Ratio/ {sub(/[\t ]*/,"");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print $1".value -"$2}'
+/usr/local/bin/zfs-stats -Z | awk '/Miss Ratio/ {sub(/[\t ]*/,"");sub(/:/,""); gsub(/[ .]/,"_",$0); sub(/%/,""); sub(/_/,".",$2); print $1".value -"$2}'

plugins/zfs/zfs_stats_

@@ -272,7 +272,7 @@ l2efficiency() {
 
 }
 
-[ "$1" = "config" ] && echo "graph_category zfs"
+[ "$1" = "config" ] && echo "graph_category filesystem"
 
 case "$FUNCTION" in
         efficiency)

plugins/zfs/zfs_usage_

@@ -183,7 +183,7 @@ sub do_config_fs {
     }
     print "graph_args --base 1024 --lower-limit 0 --rigid\n";
     print "graph_vlabel bytes \n";
-    print "graph_category zfs\n";
+    print "graph_category filesystem\n";
     print "graph_order @order\n";
 
     foreach my $key ( keys %{$filesystems->{$fs}}) {

plugins/zfs/zlist

@@ -4,7 +4,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title zpool list'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel zpool list'
-        echo 'graph_category zfs'
+        echo 'graph_category filesystem'
         echo 'graph_scale no'
         echo 'graph_info This graph shows zpool list on the server.'
 	zlist=`/sbin/zpool list -H|awk '{print $1}'`

plugins/zfs/zpool_iostat

@@ -17,7 +17,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title zpool iostat'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel write - read KBytes/s'
-        echo 'graph_category zfs'
+        echo 'graph_category filesystem'
         echo 'graph_scale no'
         echo 'graph_info This graph shows zpool iostat'
 	echo 'graph_order '$zorder