Category Tree: Reduce number of categories

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

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)) {