Category Tree: Reduce number of categories

ceph, samba, zfs into "fs"
apache into "webserver"
lighttpd into "webserver"
..

plugins/amr/amr

@@ -71,7 +71,7 @@ sub config
     print "graph_args --base 1000 -l 0\n";
     print "graph_vlabel Watt\n";
     print "graph_total  Total\n";
-    print "graph_category AMR\n";
+    print "graph_category sensors\n";
 
     $count = 0;
     foreach my $station (sort keys %stations) {
@@ -92,7 +92,7 @@ sub config
     print "graph_args --base 1000 -l 0\n";
     print "graph_vlabel kWh\n";
     print "graph_scale  no\n";
-    print "graph_category AMR\n";
+    print "graph_category sensors\n";
 
     $count = 0;
     foreach my $station (sort keys %stations) {
@@ -106,7 +106,7 @@ sub config
     print "graph_title Known AMR stations\n";
     print "graph_args --base 1000 -l 0\n";
     print "graph_vlabel stations\n";
-    print "graph_category AMR\n";
+    print "graph_category sensors\n";
     print "stations.label number of stations\n";
 
     print "multigraph amr_signals\n";
@@ -114,7 +114,7 @@ sub config
     print "graph_args --base 1000 -l 0\n";
     print "graph_vlabel signals / \${graph_period}\n";
     print "graph_period minute\n";
-    print "graph_category AMR\n";
+    print "graph_category sensors\n";
     $count = 0;
     foreach my $station (sort keys %stations) {
 	my $name = clean_fieldname('station signals ' . $station);

plugins/apache/apache_activity

@@ -65,7 +65,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "autoconf") {
 if (exists $ARGV[0] and $ARGV[0] eq "config") {
     print "graph_title Apache activity\n";
     print "graph_args --base 1000 -l 0\n";
-    print "graph_category apache\n";
+    print "graph_category webserver\n";
     print "graph_vlabel processes\n";
     foreach my $port (@PORTS) {
 	while (my ($char, $val) = each (%chars)) {

plugins/apache/apache_average_time_last_n_requests

@@ -53,7 +53,7 @@ graph_title Apache average seconds last $LAST_N_REQUESTS requests
 graph_args --base 1000
 graph_scale no
 graph_vlabel Average request time
-graph_category Apache
+graph_category webserver
 graph_info This graph shows average request times for the last $LAST_N_REQUESTS requests
 CONFIG
 ;

plugins/apache/apache_blackbox

@@ -64,7 +64,7 @@ sub print_config {
     print("graph_title HTTP requests status
 graph_args --base 1000
 graph_vlabel requests / second
-graph_category Network
+graph_category webserver
 graph_total total\n");
 
     for my $key (sort { $WANTED{$a} cmp $WANTED{$b} } (keys %WANTED)) {

plugins/apache/apache_cache_disk_count

@@ -88,7 +88,7 @@ graph_title Apache mod_cache_disk usage
 graph_title Number of entries in mod_cache_disk Apache cache
 graph_args --base 1000 -l 0
 graph_vlabel Y
-graph_category Apache
+graph_category webserver
 graph_order ${fieldnames[*]} total
 total.draw LINE1
 total.label all

plugins/apache/apache_memmory

@@ -46,7 +46,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Kb'
 	echo 'graph_scale no'
-	echo 'graph_category apache'
+	echo 'graph_category webserver'
 	echo 'graph_info Indicate the memdium size of all the apache child process.'
 
 

plugins/apache/apache_servers

@@ -44,7 +44,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel servers'
 	echo 'graph_scale no'
-	echo 'graph_category apache'
+	echo 'graph_category webserver'
 	echo 'graph_info Indicate the number of apache servers running (child process).'
 
 

plugins/apache/apache_smaps

@@ -41,7 +41,7 @@ if (defined(@ARGV) && ($ARGV[0] eq 'config')) {
   print "graph_title Apache Smaps\n";
   print "graph_args --base 1024 -l 0\n";
   print "graph_vlabel Bytes\n";
-  print "graph_category apache\n";
+  print "graph_category webserver\n";
   print "graph_info This graph shows memory usage for each given process.\n";
 
   print "shr_max.label Shared memory max\n";

plugins/apache/apache_status

@@ -171,7 +171,7 @@ multigraph apache_accesses
 graph_title Apache accesses
 graph_args --base 1000 -l 0
 graph_vlabel accesses / \${graph_period}
-graph_category apache
+graph_category webserver
 END
 
   foreach my $port (@PORTS) {
@@ -191,7 +191,7 @@ graph_title Apache processes
 graph_args --base 1000 -l 0
 graph_vlabel processes
 graph_total total
-graph_category apache
+graph_category webserver
 END
 
   print "graph_order ";
@@ -224,7 +224,7 @@ multigraph apache_volume
 graph_title Apache volume
 graph_args --base 1024 -l 0
 graph_vlabel KiB per \${graph_period}
-graph_category apache
+graph_category webserver
 END
 
   foreach my $port (@PORTS) {

plugins/apache/apache_threads

@@ -42,7 +42,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Threads'
 	echo 'graph_scale no'
-	echo 'graph_category apache'
+	echo 'graph_category webserver'
 	echo 'graph_info Indicate the memdium number of threads for all child process.'
 
 

plugins/apache/apache_tmemmory

@@ -45,7 +45,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Mb'
 	echo 'graph_scale no'
-	echo 'graph_category apache'
+	echo 'graph_category webserver'
 	echo 'graph_info Indicate the total memory used by apache.'
 
         echo "servers.label servers"

plugins/apache/apache_users

@@ -133,7 +133,7 @@ then
 	echo "graph_title Apache users"
 	echo "graph_vlabel bytes per five minute period"
 	echo "graph_args --lower-limit 1 --base 1024 --logarithmic"
-	echo "graph_category Apache"
+	echo "graph_category webserver"
 	echo "graph_total total"
 	echo "graph_info Webserver traffic by user."
 

plugins/apache/apache_vhosts/apache_vhosts

@@ -117,7 +117,7 @@ multigraph apache_vhosts_$check
 graph_title average $check on all active vhosts
 graph_args --base 1000
 graph_vlabel average $check per response
-graph_category apache
+graph_category webserver
 graph_period minute
 graph_order $order
 END
@@ -139,7 +139,7 @@ multigraph apache_vhosts_$check.$site
 graph_title average $check on $data{$site}{'label'}
 graph_args --base 1000
 graph_vlabel average response in $check
-graph_category apache
+graph_category webserver
 graph_period minute
 END
 
@@ -168,7 +168,7 @@ multigraph apache_vhosts_requests
 graph_title requests by vhost
 graph_args --base 1000
 graph_vlabel requests / \${graph_period}
-graph_category apache
+graph_category webserver
 graph_period minute
 graph_order $order
 END
@@ -193,7 +193,7 @@ multigraph apache_vhosts_requests.$site
 graph_title status codes on $data{$site}{'label'}
 graph_args --base 1000
 graph_vlabel status codes / \${graph_period}
-graph_category apache
+graph_category webserver
 graph_period minute
 END
       my $draw='AREA';

plugins/apache/apache_watch_

@@ -91,7 +91,7 @@ my $action = $1;
 if (exists $ARGV[0] and $ARGV[0] eq "config") {
   print "graph_title Apache $plugs{$action}\n";
   print "graph_args --base 1000 -l 0\n";
-  print "graph_category apache\n";
+  print "graph_category webserver\n";
   print "graph_vlabel activity\n";
   my $i = 0;
   foreach my $server (sort (@servers)) {

plugins/ceph/ceph_capacity

@@ -38,7 +38,7 @@ CRITICAL_LEVEL=${critical_level:-"90"}
 if [ "$1" = "config" ]; then
 	
 	echo 'graph_title CEPH capacity'
-	echo 'graph_category ceph'
+	echo 'graph_category fs'
 	echo 'graph_vlabel GB'
 	echo 'graph_info CEPH cluster capacity'
 	echo 'graph_args --base 1000 -l 0'

plugins/ceph/ceph_osd

@@ -30,7 +30,7 @@ fi
 if [ "$1" = "config" ]; then
 	
 	echo 'graph_title CEPH OSDs'
-	echo 'graph_category ceph'
+	echo 'graph_category fs'
 	echo 'graph_vlabel nr'
 	echo 'graph_info CEPH OSD up/down status'
 	echo 'graph_scale no'

plugins/lighttpd/lighttpd_

@@ -71,7 +71,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config":
     params = graph_types[graph_type]
     for item in params:
         print "graph_title %s" % item["title"]
-        print "graph_category lighttpd"
+        print "graph_category webserver"
         for field in item["fields"]:
             print "%s.label %s" % (field, field)
             print "%s.type %s" % (field, item["type"])

plugins/php/php_apc_

@@ -76,7 +76,7 @@ cat <<'EOM'
 graph_title APC Hits
 graph_args -l 0
 graph_vlabel Cache hits
-graph_category php-apc
+graph_category memory
 graph_total Total
 num_misses.label Misses
 num_misses.draw AREA
@@ -96,7 +96,7 @@ graph_title APC Percents
 graph_args -l 0 --upper-limit 100
 graph_scale no
 graph_vlabel Cache Percents %
-graph_category php-apc
+graph_category memory
 hits.label Hits
 hits.draw AREA
 hits.min 0

plugins/php/php_time_execution

@@ -53,7 +53,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Time in microsecond'
  
-        echo "graph_category php-time"
+        echo "graph_category webserver"
         echo "graph_info This graph shows load time in ms of $target"
         echo "minloadtime.label Min time"
         echo "minloadtime.info Min time"

plugins/samba/samba_locked

@@ -26,7 +26,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title Samba Locked Files'
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel number of locked files' 
-	echo 'graph_category Samba'
+	echo 'graph_category fs'
 	echo 'graph_info This graph shows the number locked Samba Files.'
 	echo 'samba_locked.label Locked Files'
 	echo 'samba_locked.draw LINE2'

plugins/samba/samba_users

@@ -32,7 +32,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title Samba Users'
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel number of Samba users.' 
-	echo 'graph_category Samba'
+	echo 'graph_category fs'
 	echo 'graph_info This graph shows the number Samba users.'
 	echo 'samba_users.label Samba Users'
 	echo 'samba_users.draw LINE2'

plugins/sensors/battery_

@@ -17,6 +17,7 @@ percent=${percent:-"no"}
 if [ "$1" = "config" ]
 then
 	echo "graph_title Battery $battery_name"
+  echo "graph_category sensors"
 	if [ "$percent" = "yes" ]
 	then
 		echo "graph_vlabel %"

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
 graph_info This graph shows how is used a zfs filesystems.
-graph_category disk
+graph_category fs
 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 disk'
+    echo 'graph_category fs'
     echo 'graph_info This graph shows the ARC Efficiency'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /Efficiency/ {print}' | \

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 disk'
+    echo 'graph_category fs'
     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 disk'
+    echo 'graph_category fs'
     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 disk'
+    echo 'graph_category fs'
     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}' | \

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 disk'
+    echo 'graph_category fs'
     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"}' 

plugins/zfs/zfs_cache_efficiency

@@ -15,7 +15,7 @@ case $1 in
 graph_title ZFS ARC efficiency
 graph_vlabel %
 graph_scale no
-graph_category disk
+graph_category fs
 graph_args -l 0 
 graph_info FreeBSD ZFS ARC Utilisation - Counters
 graph_period minute

plugins/zfs/zfs_list

@@ -38,7 +38,7 @@ graph_title $fsname usage
 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 disk
+graph_category fs
 graph_period second
 usedbydataset.label UsedByDataset
 usedbydataset.draw AREA

plugins/zfs/zfs_stats_

@@ -272,7 +272,7 @@ l2efficiency() {
 
 }
 
-[ "$1" = "config" ] && echo "graph_category disk"
+[ "$1" = "config" ] && echo "graph_category fs"
 
 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 disk\n";
+    print "graph_category fs\n";
     print "graph_order @order\n";
 
     foreach my $key ( keys %{$filesystems->{$fs}}) {

plugins/zfs/zfsarcstats-counters

@@ -13,7 +13,7 @@ case $1 in
 graph_title ZFS ARC Counters
 graph_vlabel per second
 graph_scale no
-graph_category disk
+graph_category fs
 graph_args -l 0
 graph_info FreeBSD ZFS ARC Utilisation - Counters
 EOF

plugins/zfs/zfsonlinux_stats_

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

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 disk'
+        echo 'graph_category fs'
         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 disk'
+        echo 'graph_category fs'
         echo 'graph_scale no'
         echo 'graph_info This graph shows zpool iostat'
 	echo 'graph_order '$zorder