From 33e95e6ff9d9e634dfba2fd200b5777bab1ff9da Mon Sep 17 00:00:00 2001
From: Lars Kruse <devel@sumpfralle.de>
Date: Wed, 1 Aug 2018 23:56:56 +0200
Subject: [PATCH] Review and unify category assignments of plugins

---
 plugins/chat/tinychat_users_                  |  2 +-
 plugins/courier/courier_log                   |  2 +-
 .../currency/zcash/zcash_flypool_hashrate_    |  2 +-
 plugins/gpu/amd_gpu_                          |  4 +--
 plugins/harddisks/powered_up_                 |  2 +-
 plugins/http/mongrel_memory                   |  2 +-
 plugins/http/mongrel_process_memory           |  2 +-
 plugins/jmx/examples/java/java_cpu.conf       |  2 +-
 .../examples/java/java_process_memory.conf    |  2 +-
 plugins/jmx/examples/java/java_threads.conf   |  2 +-
 .../examples/tomcat/catalina_requests.conf    |  2 +-
 .../jmx/examples/tomcat/catalina_threads.conf |  2 +-
 .../jmx/examples/tomcat/catalina_times.conf   |  3 +-
 .../jmx/examples/tomcat/catalina_traffic.conf |  2 +-
 plugins/jmx/readme.txt                        |  2 +-
 plugins/libvirt/kvm_cpu                       |  2 +-
 plugins/libvirt/kvm_io                        |  2 +-
 plugins/libvirt/kvm_mem                       |  2 +-
 plugins/libvirt/libvirt                       | 32 +++++++++----------
 plugins/libvirt/munin-libvirtpy               |  2 +-
 plugins/moinmoin/moinoin_pages                |  2 +-
 plugins/network/quagga_routes                 |  2 +-
 plugins/network/zenus_                        |  2 +-
 plugins/omreport/omreport_fan_speed           |  2 +-
 plugins/omreport/omreport_pwrmon_current      |  2 +-
 plugins/omreport/omreport_pwrmon_power        |  2 +-
 plugins/omreport/omreport_storage_temp        |  2 +-
 plugins/omreport/omreport_temp                |  2 +-
 plugins/other/earthquakes                     |  2 +-
 plugins/other/foldingathome_activecpu         |  2 +-
 plugins/other/radwho_cnt                      |  2 +-
 plugins/punbb/punbb_users                     |  2 +-
 plugins/qmail/qmailsend                       |  2 +-
 plugins/qmail/qmailsend_plesk                 |  2 +-
 plugins/qmail/qremote                         |  2 +-
 plugins/reddit_karma/reddit_karma_            |  2 +-
 plugins/router/tg585v7__                      | 20 ++++++------
 plugins/sickbeard/sickbeard_episodes          |  2 +-
 plugins/sickbeard/sickbeard_shows             |  2 +-
 plugins/snmp/snmp__brocade_ifs                |  4 +--
 plugins/spotweb/spotweb_average               |  2 +-
 plugins/spotweb/spotweb_cat_average           |  2 +-
 plugins/spotweb/spotweb_cat_total             |  2 +-
 plugins/spotweb/spotweb_catsize_average       |  2 +-
 plugins/spotweb/spotweb_total                 |  2 +-
 plugins/squid/squid                           | 22 ++++++-------
 plugins/squid/squid_efficiency                |  2 +-
 plugins/squid/squid_times                     |  2 +-
 plugins/virtualbox/virtualbox_cpu_kernel      |  2 +-
 plugins/virtualbox/virtualbox_cpu_user        |  2 +-
 plugins/virtualbox/virtualbox_ram_usage       |  2 +-
 plugins/voip/zapchans                         |  2 +-
 plugins/xen/xen                               |  2 +-
 plugins/xen/xen-cpu                           |  2 +-
 plugins/xen/xen-multi                         | 10 +++---
 plugins/xen/xen_cpu_v2                        |  2 +-
 plugins/xen/xen_memory                        |  2 +-
 plugins/xen/xen_traffic_                      |  2 +-
 plugins/xen/xen_vbd                           |  2 +-
 59 files changed, 99 insertions(+), 100 deletions(-)

diff --git a/plugins/chat/tinychat_users_ b/plugins/chat/tinychat_users_
index d366b372..b9c8d258 100755
--- a/plugins/chat/tinychat_users_
+++ b/plugins/chat/tinychat_users_
@@ -36,7 +36,7 @@ echo "graph_title Tinychat Users for $room"
     echo 'graph_args --base 1000'
     echo 'graph_scale no'
     echo 'graph_vlabel Room Users'
-    echo 'graph_category Chat'
+    echo 'graph_category chat'
     echo 'total_count.label Room Users'
     echo 'total_count.draw AREA'
     echo 'broadcaster_count.draw STACK'
diff --git a/plugins/courier/courier_log b/plugins/courier/courier_log
index f1796d4e..62231f58 100755
--- a/plugins/courier/courier_log
+++ b/plugins/courier/courier_log
@@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then
 graph_title Courier log ($type)
 graph_args --base 1000 -l 0 
 graph_vlabel events per second
-graph_category Mail
+graph_category mail
 EOT
 echo "$CATEGORIES" | while read field label match; do
 	echo "${field}.label $(echo "$label" | tr "_" " ")"
diff --git a/plugins/currency/zcash/zcash_flypool_hashrate_ b/plugins/currency/zcash/zcash_flypool_hashrate_
index 8db6effc..a93c0acc 100755
--- a/plugins/currency/zcash/zcash_flypool_hashrate_
+++ b/plugins/currency/zcash/zcash_flypool_hashrate_
@@ -63,7 +63,7 @@ if command == 'config':
     print("graph_title Flypool {}".format(miner))
     print("graph_info zcash.flypool.org Mining Pool Hashrate for {}_{}".format(zcash_address, miner))
     print("graph_vlabel Flypool Hashrate")
-    print("graph_category other")
+    print("graph_category htc")
     print("flypool_hs_{}_{}.warning 200:".format(zcash_address, miner))
     print("flypool_hs_{}_{}.critical 100:".format(zcash_address, miner))
     print("flypool_hs_{}_{}.label H/s:".format(zcash_address, miner))
diff --git a/plugins/gpu/amd_gpu_ b/plugins/gpu/amd_gpu_
index 85491c8d..3bbc2ae8 100755
--- a/plugins/gpu/amd_gpu_
+++ b/plugins/gpu/amd_gpu_
@@ -138,7 +138,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU clock'
 			echo "graph_args -l 0 -u $maxclock"
 			echo 'graph_vlabel MHz'
-			echo 'graph_category sensors'
+			echo 'graph_category htc'
 			echo "graph_info Core and memory clock info for AMD GPUs"
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
@@ -170,7 +170,7 @@ if [ "$1" = "config" ]; then
 			echo 'graph_title GPU load'
 			echo 'graph_args -l 0 -u 100'
 			echo 'graph_vlabel Percentage'
-			echo 'graph_category sensors'
+			echo 'graph_category htc'
 			echo "graph_info GPU load"			
 			nGpusCounter=0
 			while [ $nGpusCounter -lt $nGpus ]
diff --git a/plugins/harddisks/powered_up_ b/plugins/harddisks/powered_up_
index 3eddfd25..24eff467 100755
--- a/plugins/harddisks/powered_up_
+++ b/plugins/harddisks/powered_up_
@@ -12,7 +12,7 @@ case $1 in
         cat <<EOM
 graph_title Power State (/dev/$device)
 graph_vlabel Power State
-graph_category sensors
+graph_category disk
 power.label power
 graph_info The power state of drives on the system.
 power.info The power state of the drive (1 is on, 0 is off)
diff --git a/plugins/http/mongrel_memory b/plugins/http/mongrel_memory
index ab54e3f1..1638ba65 100755
--- a/plugins/http/mongrel_memory
+++ b/plugins/http/mongrel_memory
@@ -67,7 +67,7 @@ case ARGV[0]
 when "config"
   puts "graph_title Mongrel Memory"
   puts "graph_vlabel RSS"
-  puts "graph_category Memory"
+  puts "graph_category memory"
   puts "graph_args --base 1024 -l 0"
   puts "graph_scale yes"
   puts "graph_info Tracks the size of individual mongrel processes"
diff --git a/plugins/http/mongrel_process_memory b/plugins/http/mongrel_process_memory
index 5966655d..b06267ed 100755
--- a/plugins/http/mongrel_process_memory
+++ b/plugins/http/mongrel_process_memory
@@ -78,7 +78,7 @@ case ARGV[0]
 when "config"
   puts "graph_title Mongrel Memory"
   puts "graph_vlabel RSS"
-  puts "graph_category Memory"
+  puts "graph_category memory"
   puts "graph_args --base 1024 -l 0"
   puts "graph_scale yes"
   puts "graph_info Tracks the size of individual mongrel processes"
diff --git a/plugins/jmx/examples/java/java_cpu.conf b/plugins/jmx/examples/java/java_cpu.conf
index 1e56cd34..852f466e 100644
--- a/plugins/jmx/examples/java/java_cpu.conf
+++ b/plugins/jmx/examples/java/java_cpu.conf
@@ -2,7 +2,7 @@ graph_args --upper-limit 100 -l 0
 graph_scale no
 graph_title CPU Usage
 graph_vlabel 1000* CPU time %
-graph_category Java
+graph_category appserver
 graph_order java_cpu_time java_cpu_user_time
 
 java_cpu_time.label cpu
diff --git a/plugins/jmx/examples/java/java_process_memory.conf b/plugins/jmx/examples/java/java_process_memory.conf
index ddbdc4d0..cf872a9c 100644
--- a/plugins/jmx/examples/java/java_process_memory.conf
+++ b/plugins/jmx/examples/java/java_process_memory.conf
@@ -1,6 +1,6 @@
 graph_title Process Memory
 graph_vlabel Bytes
-graph_category Java
+graph_category appserver
 graph_order java_memory_nonheap_committed java_memory_nonheap_max java_memory_nonheap_used java_memory_heap_committed java_memory_heap_max java_memory_heap_used os_memory_physical os_memory_vm
 
 java_memory_nonheap_committed.label non-heap committed
diff --git a/plugins/jmx/examples/java/java_threads.conf b/plugins/jmx/examples/java/java_threads.conf
index f8b64cd4..42a9bcc1 100644
--- a/plugins/jmx/examples/java/java_threads.conf
+++ b/plugins/jmx/examples/java/java_threads.conf
@@ -1,6 +1,6 @@
 graph_title Thread Count
 graph_vlabel Thread Count
-graph_category Java
+graph_category appserver
 graph_order java_thread_count java_thread_count_peak
 
 java_thread_count.label count
diff --git a/plugins/jmx/examples/tomcat/catalina_requests.conf b/plugins/jmx/examples/tomcat/catalina_requests.conf
index acb48175..e6f8629e 100644
--- a/plugins/jmx/examples/tomcat/catalina_requests.conf
+++ b/plugins/jmx/examples/tomcat/catalina_requests.conf
@@ -1,6 +1,6 @@
 graph_title Requests Per Second
 graph_vlabel requests per second
-graph_category Tomcat
+graph_category appserver
 graph_order catalina_request_count catalina_error_count
 
 catalina_request_count.label requests 
diff --git a/plugins/jmx/examples/tomcat/catalina_threads.conf b/plugins/jmx/examples/tomcat/catalina_threads.conf
index 32ab44c2..c6e86f03 100644
--- a/plugins/jmx/examples/tomcat/catalina_threads.conf
+++ b/plugins/jmx/examples/tomcat/catalina_threads.conf
@@ -1,6 +1,6 @@
 graph_title Thread Count
 graph_vlabel Thread Count
-graph_category Tomcat
+graph_category appserver
 graph_order catalina_threads_count catalina_threads_busy
 
 catalina_threads_busy.label busy
diff --git a/plugins/jmx/examples/tomcat/catalina_times.conf b/plugins/jmx/examples/tomcat/catalina_times.conf
index e3790259..5260c8b4 100644
--- a/plugins/jmx/examples/tomcat/catalina_times.conf
+++ b/plugins/jmx/examples/tomcat/catalina_times.conf
@@ -1,9 +1,8 @@
 graph_title Response Time
 graph_vlabel Time, ms
-graph_category Rules Engine
+graph_category appserver
 graph_args --upper-limit 100 -l 0
 graph_scale no
-graph_category Tomcat
 graph_order catalina_request_count catalina_max_time catalina_proc_time catalina_proc_tpr
 
 catalina_request_count.label requests
diff --git a/plugins/jmx/examples/tomcat/catalina_traffic.conf b/plugins/jmx/examples/tomcat/catalina_traffic.conf
index f6d9498d..0c6b8817 100644
--- a/plugins/jmx/examples/tomcat/catalina_traffic.conf
+++ b/plugins/jmx/examples/tomcat/catalina_traffic.conf
@@ -1,6 +1,6 @@
 graph_title Traffic
 graph_vlabel Bytes rec(-)/sent(+) per second
-graph_category Tomcat
+graph_category appserver
 graph_order catalina_bytes_received catalina_bytes_sent
 
 catalina_bytes_sent.label bps
diff --git a/plugins/jmx/readme.txt b/plugins/jmx/readme.txt
index cae58a28..44a01282 100644
--- a/plugins/jmx/readme.txt
+++ b/plugins/jmx/readme.txt
@@ -41,7 +41,7 @@ env.jmxurl service:jmx:rmi:///jndi/rmi://localhost:1616/jmxrmi
 To check that all installed properly, try invoke plugins from command line, using links like:
 
 root@re:/etc/munin/plugins# ./jmx_java_process_memory config
-graph_category Java
+graph_category appserver
 ...
 root@re:/etc/munin/plugins# ./jmx_java_process_memory
 java_memory_nonheap_committed.value 35291136
diff --git a/plugins/libvirt/kvm_cpu b/plugins/libvirt/kvm_cpu
index 81e6cc75..f671a4c6 100755
--- a/plugins/libvirt/kvm_cpu
+++ b/plugins/libvirt/kvm_cpu
@@ -25,7 +25,7 @@ def config(vm_names):
 
     base_config = """graph_title KVM Virtual Machine CPU usage
 graph_vlabel %%
-graph_category Virtualization
+graph_category virtualization
 graph_scale no
 graph_period second
 graph_info This graph shows the current CPU used by virtual machines
diff --git a/plugins/libvirt/kvm_io b/plugins/libvirt/kvm_io
index ac072025..4bbf40a2 100755
--- a/plugins/libvirt/kvm_io
+++ b/plugins/libvirt/kvm_io
@@ -23,7 +23,7 @@ def config(vm_names):
     '''
     base_config = """graph_title KVM Virtual Machine IO usage
 graph_vlabel Bytes read(-)/written(+) per second
-graph_category Virtualization
+graph_category virtualization
 graph_info This graph shows the block device I/O used of virtual machines
 graph_args --base 1024
     """
diff --git a/plugins/libvirt/kvm_mem b/plugins/libvirt/kvm_mem
index 14de0275..55f8e1f1 100755
--- a/plugins/libvirt/kvm_mem
+++ b/plugins/libvirt/kvm_mem
@@ -23,7 +23,7 @@ def config(vm_names):
     '''
     base_config = """graph_title KVM Virtual Machine Memory usage
 graph_vlabel Bytes
-graph_category Virtualization
+graph_category virtualization
 graph_info This graph shows the current amount of memory used by virtual machines
 graph_args --base 1024
     """
diff --git a/plugins/libvirt/libvirt b/plugins/libvirt/libvirt
index 4b2bdcfd..2ca31b3e 100755
--- a/plugins/libvirt/libvirt
+++ b/plugins/libvirt/libvirt
@@ -201,7 +201,7 @@ sub init() {
       #print "graph_order rd wr\n";
       print "graph_title Disk utilization per domain in percent\n";
       print "graph_vlabel %\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
       print "graph_args -l 0 --base 1000 --upper-limit 100\n";
       #print "graph_width 550\n";
   
@@ -271,7 +271,7 @@ sub init() {
         #print "graph_order rd wr\n";
         print "graph_title Disk utilization on " . $vm . " in percent\n";
         print "graph_vlabel %\n";
-        print "graph_category Virtualization\n";
+        print "graph_category virtualization\n";
         print "graph_args -l 0 --base 1000 --upper-limit 100\n";
         #print "graph_width 550\n";
     
@@ -341,7 +341,7 @@ sub init() {
       print "graph_title Disk latency per domain in seconds\n";
       print "graph_args --base 1000\n";
       print "graph_vlabel read (-) / write (+)\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
       #print "graph_width 550\n";
   
       for my $vm (sort keys %hash) {
@@ -454,7 +454,7 @@ sub init() {
           print "graph_title Disk latency per vbd on $vm in seconds\n";
           print "graph_args --base 1000\n";
           print "graph_vlabel read (-) / write (+)\n";
-          print "graph_category Virtualization\n";
+          print "graph_category virtualization\n";
           #print "graph_width 550\n";
   
           if(defined($hash{$vm}{'devices'}{'block'})){
@@ -552,7 +552,7 @@ sub init() {
       print "graph_title Disk traffic per domain in bytes\n";
       print "graph_args --base 1000\n";
       print "graph_vlabel bytes read (-) / written (+) per \${graph_period}\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
       #print "graph_width 550\n";
   
       for my $vm (sort keys %hash) {
@@ -621,7 +621,7 @@ sub init() {
             print "graph_title Disk traffic for " . $hash{$vm}{'name'} . "\n";
             print "graph_args --base 1000\n";
             print "graph_vlabel bytes read (-) / written (+) per \${graph_period}\n";
-            print "graph_category Virtualization\n";
+            print "graph_category virtualization\n";
             #print "graph_width 550\n";
     
             for my $device (keys %{$hash{$vm}{'devices'}{'block'}}){
@@ -671,7 +671,7 @@ sub init() {
       print "multigraph libvirt_disk_errs\n";
       print "graph_title Disk errors per domain\n";
       print "graph_args --base 1000\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
   
       for my $vm (sort keys %hash) {
         if(defined($hash{$vm}{'devices'}{'block'})){
@@ -723,7 +723,7 @@ sub init() {
             print "multigraph libvirt_disk_errs." . $hash{$vm}{'label'} . "\n";
             print "graph_title Disk errors for " . $hash{$vm}{'name'} . "\n";
             print "graph_args --base 1000\n";
-            print "graph_category Virtualization\n";
+            print "graph_category virtualization\n";
   
             for my $device (keys %{$hash{$vm}{'devices'}{'block'}}){
             
@@ -764,7 +764,7 @@ sub init() {
       print "graph_title Network traffic per domain in bytes\n";
       print "graph_args --base 1000\n";
       print "graph_vlabel Bytes in (-) / out (+) per \${graph_period}\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
       #print "graph_width 550\n";
   
       for my $vm (sort keys %hash) {
@@ -817,7 +817,7 @@ sub init() {
           print "graph_title Network traffic for " . $vm . "\n";
           print "graph_args --base 1000\n";
           print "graph_vlabel Bits in (-) / out (+) per \${graph_period}\n";
-          print "graph_category Virtualization\n";
+          print "graph_category virtualization\n";
           #print "graph_width 550\n";
     
           for my $vif (keys %{$hash{$vm}{'devices'}{'network'}}){
@@ -870,7 +870,7 @@ sub init() {
       print "graph_title Network packets dropped per domain\n";
       print "graph_args --base 1000\n";
       print "graph_vlabel Count in (-) / out (+) per \${graph_period}\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
       #print "graph_width 550\n";
   
       for my $vm (sort keys %hash) {
@@ -923,7 +923,7 @@ sub init() {
           print "graph_title Network packeds dropped by " . $vm . "\n";
           print "graph_args --base 1000\n";
           print "graph_vlabel Count in (-) / out (+) per \${graph_period}\n";
-          print "graph_category Virtualization\n";
+          print "graph_category virtualization\n";
           #print "graph_width 550\n";
     
           for my $vif (keys %{$hash{$vm}{'devices'}{'network'}}){
@@ -971,7 +971,7 @@ sub init() {
       print "multigraph libvirt_cpu\n";
       print "graph_title Cpu time used per domain in percent\n";
       print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
       #print "graph_width 550\n";
   
       my $draw="AREA";
@@ -1002,7 +1002,7 @@ sub init() {
         print "multigraph libvirt_cpu.vm_" . $hash{$vm}{'label'} . "\n";
         print "graph_title Cpu time used by " . $hash{$vm}{'name'} . " in percent\n";
         print "graph_args --base 1000\n";
-        print "graph_category Virtualization\n";
+        print "graph_category virtualization\n";
         #print "graph_width 550\n";
   
         print "time.label " . $hash{$vm}{'name'} . " (" . $hash{$vm}{'type'} . ")\n";
@@ -1036,7 +1036,7 @@ sub init() {
       print "multigraph libvirt_mem\n";
       print "graph_title Memory allocated per domain\n";
       print "graph_args --base 1000\n";
-      print "graph_category Virtualization\n";
+      print "graph_category virtualization\n";
       #print "graph_width 550\n";
   
       my $draw="AREA";
@@ -1067,7 +1067,7 @@ sub init() {
         print "multigraph libvirt_mem.vm_" . $hash{$vm}{'label'} . "\n";
         print "graph_title Memory allocated to " . $hash{$vm}{'name'} . "\n";
         print "graph_args --base 1000\n";
-        print "graph_category Virtualization\n";
+        print "graph_category virtualization\n";
         #print "graph_width 550\n";
   
         print "mem.label " . $hash{$vm}{'name'} . " (" . $hash{$vm}{'type'} . ")\n";
diff --git a/plugins/libvirt/munin-libvirtpy b/plugins/libvirt/munin-libvirtpy
index 34631725..1620bbd3 100755
--- a/plugins/libvirt/munin-libvirtpy
+++ b/plugins/libvirt/munin-libvirtpy
@@ -37,7 +37,7 @@ if len(sys.argv) == 2:
         print "graph_title KVM Domain CPU Utilization"
         print "graph_vlabel CPU use in seconds"
         print "graph_args --base 1000"
-        print "graph_category Virtualization"
+        print "graph_category virtualization"
 
         for id in ids:
             dom = conn.lookupByID(id)
diff --git a/plugins/moinmoin/moinoin_pages b/plugins/moinmoin/moinoin_pages
index bc21068a..e56cc2d5 100755
--- a/plugins/moinmoin/moinoin_pages
+++ b/plugins/moinmoin/moinoin_pages
@@ -99,7 +99,7 @@ def config():
 graph_vlabel Number of pages
 graph_args --base 1000 -l 0
 graph_scale no
-graph_category Wiki
+graph_category wiki
 graph_info The number of pages excludes system pages but includes ACL-protected pages.""")
     for wiki in wikis:
         name = wiki[0]
diff --git a/plugins/network/quagga_routes b/plugins/network/quagga_routes
index 51b87561..da586205 100755
--- a/plugins/network/quagga_routes
+++ b/plugins/network/quagga_routes
@@ -4,7 +4,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title quagga routes'
 	echo 'graph_args -l 0'
 	echo 'graph_vlabel routes'
-	echo 'graph_category System'
+	echo 'graph_category network'
 	echo 'graph_scale no'
 	/usr/local/bin/vtysh -e "sh ip ro sum" | awk '
 	/connected/     {print $1 ".label " $1 "\n" $1 ".draw AREASTACK"}
diff --git a/plugins/network/zenus_ b/plugins/network/zenus_
index 319bf2fd..65d4bf04 100755
--- a/plugins/network/zenus_
+++ b/plugins/network/zenus_
@@ -262,7 +262,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) {
     print <<EOF;
 graph_args --base 1000
 graph_vlabel GBytes out (-) / in (+)
-graph_category Network
+graph_category network
 graph_title Zen Broadband Usage ($ACCT)
 graph_info Usage of your Zen Broadband account: $data->{name}
 upload.label Uploaded
diff --git a/plugins/omreport/omreport_fan_speed b/plugins/omreport/omreport_fan_speed
index c8694f11..2401897d 100755
--- a/plugins/omreport/omreport_fan_speed
+++ b/plugins/omreport/omreport_fan_speed
@@ -92,7 +92,7 @@ else {
                 print "graph_title OpenManage - Fan Probes\n";
                 print "graph_args --base 1000 -l 0\n";
                 print "graph_vlabel Speed in RPMs\n";
-                print "graph_category Sensors\n";
+                print "graph_category sensors\n";
                 foreach my $j (sort keys %val) {
                         print "fan_$j.label $val{$j}{\"Probe Name\"}\n";
                         if ($val{$j}{"Warning Threshold"} !~ m/\[N\/A\]/i) {
diff --git a/plugins/omreport/omreport_pwrmon_current b/plugins/omreport/omreport_pwrmon_current
index 0734764c..b8e8a0cc 100755
--- a/plugins/omreport/omreport_pwrmon_current
+++ b/plugins/omreport/omreport_pwrmon_current
@@ -91,7 +91,7 @@ else {
         print "graph_title OpenManage - Power Monitoring - Current\n";
         print "graph_args --base 1000 -l 0\n";
         print "graph_vlabel Amps\n";
-        print "graph_category Sensors\n";
+        print "graph_category sensors\n";
         foreach my $j (sort keys %val) {
             print "$j.label $val{$j}{label}\n";
         }
diff --git a/plugins/omreport/omreport_pwrmon_power b/plugins/omreport/omreport_pwrmon_power
index 0d223ca2..c5c2ddbe 100755
--- a/plugins/omreport/omreport_pwrmon_power
+++ b/plugins/omreport/omreport_pwrmon_power
@@ -101,7 +101,7 @@ else {
         print "graph_title OpenManage - Power Monitoring - Power\n";
         print "graph_args --base 1000 -l 0\n";
         print "graph_vlabel Watts\n";
-        print "graph_category Sensors\n";
+        print "graph_category sensors\n";
         foreach my $j (sort keys %val) {
             print "$j.label $val{$j}{label}\n";
             if ($val{$j}{warning}) {
diff --git a/plugins/omreport/omreport_storage_temp b/plugins/omreport/omreport_storage_temp
index b821289d..0c8be449 100755
--- a/plugins/omreport/omreport_storage_temp
+++ b/plugins/omreport/omreport_storage_temp
@@ -162,7 +162,7 @@ else {
         print "graph_title OpenManage - Storage - Temperatures\n";
         print "graph_args --base 1000 -l 0\n";
         print "graph_vlabel Temp in Degrees Celsius\n";
-        print "graph_category Sensors\n";
+        print "graph_category sensors\n";
         print "graph_info Temperature sensors within storage enclosures on the system, typically external ones managed via PERC 6/E adapters.\n";
     }
     foreach my $c (sort keys %ctrlrs) {
diff --git a/plugins/omreport/omreport_temp b/plugins/omreport/omreport_temp
index ddf2c346..f7bcb3f9 100755
--- a/plugins/omreport/omreport_temp
+++ b/plugins/omreport/omreport_temp
@@ -92,7 +92,7 @@ else {
                 print "graph_title OpenManage - Temperature Probes\n";
                 print "graph_args --base 1000 -l 0\n";
                 print "graph_vlabel Temperature in Celsius\n";
-                print "graph_category Sensors\n";
+                print "graph_category sensors\n";
                 foreach my $j (sort keys %val) {
                         print "probe_$j.label $val{$j}{\"Probe Name\"}\n";
                         print "probe_$j.warning $val{$j}{\"Warning Threshold\"}\n";
diff --git a/plugins/other/earthquakes b/plugins/other/earthquakes
index 38f9ae98..08666c57 100755
--- a/plugins/other/earthquakes
+++ b/plugins/other/earthquakes
@@ -57,7 +57,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
 {
   print "graph_title Earthquakes by region\n";
   print "graph_args --base 1000\n";
-  print "graph_category Other\n";
+  print "graph_category other\n";
   print "graph_info This graph shows earthquakes by region of magnitude 1.0 or greater.\n";
   print "graph_vlabel Number of Earthquakes\n";  
 
diff --git a/plugins/other/foldingathome_activecpu b/plugins/other/foldingathome_activecpu
index c14cf82d..3162476e 100755
--- a/plugins/other/foldingathome_activecpu
+++ b/plugins/other/foldingathome_activecpu
@@ -21,7 +21,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "autoconf":
 elif len(sys.argv) == 2 and sys.argv[1] == "config":
         print 'graph_title Active CPU in FoldingAtHome project'
         print 'graph_vlabel Systems'
-        print 'graph_category other'
+        print 'graph_category htc'
 
         print 'windows.label Windows'
         print 'ppc.label MacOS/PowerPC'
diff --git a/plugins/other/radwho_cnt b/plugins/other/radwho_cnt
index 0254f4fa..722398db 100755
--- a/plugins/other/radwho_cnt
+++ b/plugins/other/radwho_cnt
@@ -11,7 +11,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0'
 	echo 'graph_vlabel users'
 	echo 'graph_noscale true'
-	echo 'graph_category other'
+	echo 'graph_category auth'
 	echo 'usercnt.label users'
 	echo 'graph_info FreeRadius active users count.'
 	echo 'usercnt.info FreeRadius active users count'
diff --git a/plugins/punbb/punbb_users b/plugins/punbb/punbb_users
index e826400a..453fc923 100755
--- a/plugins/punbb/punbb_users
+++ b/plugins/punbb/punbb_users
@@ -55,7 +55,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
         print "graph_title Users\n";
         print "graph_args --base 1000\n";
         print "graph_vlabel current users\n";
-        print "graph_category Forum\n";
+        print "graph_category forum\n";
         print "graph_total Total\n";
 
         print "members.label Members\n";
diff --git a/plugins/qmail/qmailsend b/plugins/qmail/qmailsend
index 12a44ec2..b0b750f3 100755
--- a/plugins/qmail/qmailsend
+++ b/plugins/qmail/qmailsend
@@ -68,7 +68,7 @@ if (exists $ARGV[0]) {
         print "graph_title Qmail outgoing SMTP replies\n";
         print "graph_args --base 1000 -l 0 \n";
         print "graph_vlabel replies/hour\n";
-        print "graph_category Mail\n";
+        print "graph_category mail\n";
 	print "graph_total Total\n" if (keys (%descriptions) > 1);
 	print "graph_info This graph shows qmail-send transaction response codes.\n";
         print "graph_order res" . join(" res", sort by_code keys %descriptions) . "\n";
diff --git a/plugins/qmail/qmailsend_plesk b/plugins/qmail/qmailsend_plesk
index 22f2f7f7..2e9e767f 100755
--- a/plugins/qmail/qmailsend_plesk
+++ b/plugins/qmail/qmailsend_plesk
@@ -68,7 +68,7 @@ if (exists $ARGV[0]) {
         print "graph_title Qmail outgoing SMTP replies\n";
         print "graph_args --base 1000 -l 0 \n";
         print "graph_vlabel replies/hour\n";
-        print "graph_category Mail\n";
+        print "graph_category mail\n";
 	print "graph_total Total\n" if (keys (%descriptions) > 1);
 	print "graph_info This graph shows qmail-send transaction response codes.\n";
         print "graph_order res" . join(" res", sort by_code keys %descriptions) . "\n";
diff --git a/plugins/qmail/qremote b/plugins/qmail/qremote
index 52746152..2abe07ce 100755
--- a/plugins/qmail/qremote
+++ b/plugins/qmail/qremote
@@ -19,7 +19,7 @@ if [ "$1" = "config" ]; then
 graph_title Qmail-remote processes
 graph_args --base 1000 -l 0 
 graph_vlabel running processes
-graph_category Mail
+graph_category mail
 remote.label remote
 remote.type GAUGE
 EOT
diff --git a/plugins/reddit_karma/reddit_karma_ b/plugins/reddit_karma/reddit_karma_
index 689a283c..9ff633c7 100755
--- a/plugins/reddit_karma/reddit_karma_
+++ b/plugins/reddit_karma/reddit_karma_
@@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_args --base 1000'
     echo 'graph_scale no'
     echo 'graph_vlabel Link Karma'
-    echo 'graph_category other'
+    echo 'graph_category forum'
     echo 'comment_karma.label Comment Karma'
     echo 'comment_karma.draw LINE'
     echo 'link_karma.label Link Karma'
diff --git a/plugins/router/tg585v7__ b/plugins/router/tg585v7__
index 1f5b9e10..d410e893 100755
--- a/plugins/router/tg585v7__
+++ b/plugins/router/tg585v7__
@@ -149,7 +149,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) {
     if ( $mode eq 'bandwidth' ) {
         print <<EOF;
 graph_vlabel bps down (-) / up (+)
-graph_category Network
+graph_category network
 graph_title ADSL Bandwidth
 graph_info Sync rates for your ADSL line on $host
 down.label Bandwidth
@@ -187,7 +187,7 @@ EOF
     elsif ( $mode eq 'power' ) {
         print <<EOF;
 graph_vlabel dB down (-) / up (+)
-graph_category Network
+graph_category network
 graph_title ADSL Strength
 graph_info Signal Strengths for your ADSL line on $host
 downout.label Output Power
@@ -213,7 +213,7 @@ EOF
     elsif ( $mode eq 'errors' ) {
         print <<EOF;
 graph_vlabel Errors down (-) / up (+) per \${graph_period}
-graph_category Network
+graph_category network
 graph_title ADSL Errors
 graph_info Errors on your ADSL line on $host
 downFEC.label FEC Errors
@@ -245,7 +245,7 @@ EOF
     elsif ( $mode eq 'uptime' ) {
         print <<EOF;
 graph_vlabel uptime in days
-graph_category System
+graph_category system
 graph_title Uptime
 graph_info Uptime for your ADSL line and Router on $host
 Box.label Router
@@ -585,7 +585,7 @@ EOF
         else {
             print <<EOF
 graph_vlabel Messages/Queries per \${graph_period}
-graph_category Network
+graph_category network
 graph_title IGMP Host
 graph_info IGMP Host statistics for your Router on $host
 toosmall.label Too small
@@ -659,7 +659,7 @@ EOF
         else {
             print <<EOF
 graph_vlabel Messages/Queries per \${graph_period}
-graph_category Network
+graph_category network
 graph_title IGMP Proxy
 graph_info IGMP Proxy statistics for your Router on $host
 tooshort.label Too short IGMP packets recv
@@ -745,7 +745,7 @@ EOF
         else {
             print <<EOF
 graph_vlabel Datagrams per \${graph_period}
-graph_category Network
+graph_category network
 graph_title IP protocol
 graph_info IP protocol statistics for your Router on $host
 herrors.label IP header errors
@@ -801,7 +801,7 @@ EOF
         else {
             print <<EOF
 graph_vlabel Packets/Conections per \${graph_period}
-graph_category Network
+graph_category network
 graph_title TCP protocol
 graph_info TCP protocol statistics for your Router on $host
 attempts.label TCP connection attempts
@@ -838,7 +838,7 @@ EOF
         else {
             print <<EOF
 graph_vlabel Datagrams per \${graph_period}
-graph_category Network
+graph_category network
 graph_title UDP protocol
 graph_info UDP protocol statistics for your Router on $host
 received.label Total UDP datagrams received
@@ -864,7 +864,7 @@ EOF
         else {
             print <<EOF
 graph_vlabel Datagrams recv (-) / sent (+) per \${graph_period}
-graph_category Network
+graph_category network
 graph_title ICMP protocol
 graph_info ICMP protocol statistics for your Router on $host
 errorsr.label Packet errors
diff --git a/plugins/sickbeard/sickbeard_episodes b/plugins/sickbeard/sickbeard_episodes
index 8b297006..81d67811 100755
--- a/plugins/sickbeard/sickbeard_episodes
+++ b/plugins/sickbeard/sickbeard_episodes
@@ -45,7 +45,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config')
     print <<EOC
 graph_title Episodes
 graph_vlabel Episodes
-graph_category other
+graph_category tv
 down.label Downloaded
 snatched.label Snatched
 total.label Total
diff --git a/plugins/sickbeard/sickbeard_shows b/plugins/sickbeard/sickbeard_shows
index 9d334f50..2407d83e 100755
--- a/plugins/sickbeard/sickbeard_shows
+++ b/plugins/sickbeard/sickbeard_shows
@@ -45,7 +45,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config')
     print <<EOC
 graph_title Shows
 graph_vlabel Shows
-graph_category other
+graph_category tv
 active.label Active
 total.label Total
 EOC
diff --git a/plugins/snmp/snmp__brocade_ifs b/plugins/snmp/snmp__brocade_ifs
index a6b93b0d..de555afd 100755
--- a/plugins/snmp/snmp__brocade_ifs
+++ b/plugins/snmp/snmp__brocade_ifs
@@ -180,7 +180,7 @@ def print_config(host_name,enabled_ports):
             print('multigraph %s.port_%d' % (counter_type,portnum-1))  # ARGH: numbering base stuff
             print('graph_title Port %d %s' % (portnum-1,counter_type)) # ARGH: numbering base stuff
             print('graph_args --base 1000 -l 0')
-            print('graph_category SAN')
+            print('graph_category san')
             print('graph_info This graph shows the count of %s' % descriptions[counter_type])
 
             if counter_type == 'bits':
@@ -204,7 +204,7 @@ def print_config(host_name,enabled_ports):
         print('multigraph %s' % counter_type)
         print('graph_title %s total %s' % (host_name,counter_type))
         print('graph_args --base 1000 -l 0')
-        print('graph_category SAN')
+        print('graph_category san')
         print('graph_info This graph shows the total count of %s across all ports' % descriptions[counter_type])
 
         if counter_type == 'bits':
diff --git a/plugins/spotweb/spotweb_average b/plugins/spotweb/spotweb_average
index 2f31ee23..4e906ac0 100755
--- a/plugins/spotweb/spotweb_average
+++ b/plugins/spotweb/spotweb_average
@@ -51,7 +51,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config')
     print <<EOC
 graph_title $TITLE
 graph_vlabel Totals
-graph_category other
+graph_category tv
 spots.label New Spots
 downloaded.label Downloads
 EOC
diff --git a/plugins/spotweb/spotweb_cat_average b/plugins/spotweb/spotweb_cat_average
index 6728a987..0929fc19 100755
--- a/plugins/spotweb/spotweb_cat_average
+++ b/plugins/spotweb/spotweb_cat_average
@@ -53,7 +53,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') {
     print <<EOC
 graph_title $TITLE
 graph_vlabel Spots
-graph_category other
+graph_category tv
 cat0.label Videos/images
 cat0.colour 008edf
 cat1.label Music
diff --git a/plugins/spotweb/spotweb_cat_total b/plugins/spotweb/spotweb_cat_total
index a2013db7..3b5f789d 100755
--- a/plugins/spotweb/spotweb_cat_total
+++ b/plugins/spotweb/spotweb_cat_total
@@ -46,7 +46,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') {
 print <<EOC
 graph_title Spotweb spots by Category (Totals)
 graph_vlabel Spots
-graph_category other
+graph_category tv
 cat0.label Videos/images
 cat0.colour 0f94e1
 cat1.label Music
diff --git a/plugins/spotweb/spotweb_catsize_average b/plugins/spotweb/spotweb_catsize_average
index d4cb323e..f938954f 100755
--- a/plugins/spotweb/spotweb_catsize_average
+++ b/plugins/spotweb/spotweb_catsize_average
@@ -53,7 +53,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') {
     print <<EOC
 graph_title $TITLE
 graph_vlabel Size
-graph_category other
+graph_category tv
 cat0.label Videos/images
 cat0.colour 008edf
 cat1.label Music
diff --git a/plugins/spotweb/spotweb_total b/plugins/spotweb/spotweb_total
index 16bc5b83..10d839e4 100755
--- a/plugins/spotweb/spotweb_total
+++ b/plugins/spotweb/spotweb_total
@@ -46,7 +46,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') {
     print <<EOC
 graph_title Spotweb spots and comments (Totals)
 graph_vlabel Spots/comments
-graph_category other
+graph_category tv
 spots.label Spots
 EOC
 ;
diff --git a/plugins/squid/squid b/plugins/squid/squid
index 885b9438..1f404431 100755
--- a/plugins/squid/squid
+++ b/plugins/squid/squid
@@ -125,7 +125,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
     $config{$name}{'graph'}{'vlabel'}   = '%';
     $config{$name}{'graph'}{'args'}     = '--lower-limit 0 --upper-limit 100';
     $config{$name}{'graph'}{'scale'}    = 'no';
-    $config{$name}{'graph'}{'category'} = 'webserver';
+    $config{$name}{'graph'}{'category'} = 'loadbalancer';
     $config{$name}{'graph'}{'order'}    = 'all bytes memory disk';
     $config{$name}{'field'}{'all'}{'draw'}     = 'AREA';
     $config{$name}{'field'}{'all'}{'label'}    = 'Hits of all requests';
@@ -145,7 +145,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_traffic'}{'graph'}{'title'}    = 'Traffic statistics';
   $config{'squid_traffic'}{'graph'}{'vlabel'}   = 'bytes in (-) / out (+) per second';
   $config{'squid_traffic'}{'graph'}{'args'}     = '--base 1000';
-  $config{'squid_traffic'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_traffic'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_traffic'}{'graph'}{'order'}    = 'client_http_in server_all_in server_http_in server_ftp_in ' .
                                                   'server_other_in icp_in icp_q_in icp_r_in cd_in client_http_hit_out ' .
                                                   'client_http_out server_all_out server_http_out server_ftp_out ' .
@@ -179,7 +179,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_ipcache'}{'graph'}{'title'}    = 'IP cache statistics';
   $config{'squid_ipcache'}{'graph'}{'vlabel'}   = 'Count';
   $config{'squid_ipcache'}{'graph'}{'args'}     = '--base 1000';# --logarithmic';
-  $config{'squid_ipcache'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_ipcache'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_ipcache'}{'graph'}{'order'}    = 'request hits misses numhits neghits invdreqests entries';
   $config{'squid_ipcache'}{'field'}{'entries'}{'label'}     = 'Entries';
   $config{'squid_ipcache'}{'field'}{'request'}{'label'}     = 'Requests';
@@ -195,7 +195,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_requests'}{'graph'}{'title'}    = 'Requests statistics';
   $config{'squid_requests'}{'graph'}{'vlabel'}   = 'errors (-) / requests (+) per second';
   $config{'squid_requests'}{'graph'}{'args'}     = '--base 1000';
-  $config{'squid_requests'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_requests'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_requests'}{'graph'}{'order'}    = 'client_http_errors server_all_errors server_http_errors ' .
                                                    'server_ftp_errors server_other_errors ' .
                                                    'client_http_hits aborted_requests client_http_requests ' .
@@ -226,7 +226,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_storedir'}{'graph'}{'title'}    = 'Store directory statistics';
   $config{'squid_storedir'}{'graph'}{'vlabel'}   = 'bytes';
   $config{'squid_storedir'}{'graph'}{'args'}     = '--base 1000';
-  $config{'squid_storedir'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_storedir'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_storedir'}{'graph'}{'order'}    = 'maximum current';
   $config{'squid_storedir'}{'field'}{'maximum'}{'label'} = 'Maximum';
   $config{'squid_storedir'}{'field'}{'maximum'}{'draw'}  = 'AREA';
@@ -238,7 +238,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_memory'}{'graph'}{'title'}    = 'Store memory statistics';
   $config{'squid_memory'}{'graph'}{'vlabel'}   = 'bytes';
   $config{'squid_memory'}{'graph'}{'args'}     = '--base 1000';
-  $config{'squid_memory'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_memory'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_memory'}{'graph'}{'order'}    = 'mi_tsia mi_ob mi_sb mi_hb mi_fsb mi_fob mi_tiu mi_tf mi_ts ta ma mu';
   $config{'squid_memory'}{'field'}{'mi_tsia'}{'label'} = '[mallinfo()] Total space in arena';
   $config{'squid_memory'}{'field'}{'mi_ob'}{'label'}   = '[mallinfo()] Ordinary blocks';
@@ -261,7 +261,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_meanobject'}{'graph'}{'title'}    = 'Mean object size';
   $config{'squid_meanobject'}{'graph'}{'vlabel'}   = 'bytes';
   $config{'squid_meanobject'}{'graph'}{'args'}     = '--base 1000';
-  $config{'squid_meanobject'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_meanobject'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_meanobject'}{'graph'}{'order'}    = 'mos';
   $config{'squid_meanobject'}{'field'}{'mos'}{'label'} = 'Mean object size';
   $config{'squid_meanobject'}{'field'}{'mos'}{'draw'}  = 'LINE1';
@@ -270,7 +270,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_cpu'}{'graph'}{'title'}    = 'CPU usage';
   $config{'squid_cpu'}{'graph'}{'vlabel'}   = '%';
   $config{'squid_cpu'}{'graph'}{'args'}     = '--base 1000 --lower-limit 0';
-  $config{'squid_cpu'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_cpu'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_cpu'}{'graph'}{'scale'}    = 'no';
   $config{'squid_cpu'}{'graph'}{'order'}    = 'cur av5 av60';
   $config{'squid_cpu'}{'field'}{'cur'}{'label'}  = 'Current';
@@ -288,7 +288,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
   $config{'squid_ids'}{'graph'}{'title'}    = 'Internal data structures';
   $config{'squid_ids'}{'graph'}{'vlabel'}   = 'Count';
   $config{'squid_ids'}{'graph'}{'args'}     = '--lower-limit 0';
-  $config{'squid_ids'}{'graph'}{'category'} = 'webserver';
+  $config{'squid_ids'}{'graph'}{'category'} = 'loadbalancer';
   $config{'squid_ids'}{'graph'}{'order'}    = 'se sewmo hoci odo';
   $config{'squid_ids'}{'field'}{'se'}{'label'} = 'StoreEntries';
   $config{'squid_ids'}{'field'}{'se'}{'draw'}  = 'LINE1';
@@ -305,7 +305,7 @@ if($ARGV[0] and $ARGV[0] eq "config")
     $config{$name}{'graph'}{'title'}    = "Median service times in ${time} minuts";
     $config{$name}{'graph'}{'vlabel'}   = 'seconds';
     $config{$name}{'graph'}{'args'}     = '--base 1000';
-    $config{$name}{'graph'}{'category'} = 'webserver';
+    $config{$name}{'graph'}{'category'} = 'loadbalancer';
     $config{$name}{'graph'}{'order'}    = 'hra cm ch nh nmr dl iq';
     $config{$name}{'field'}{'hra'}{'label'} = 'HTTP Requests (All)';
     $config{$name}{'field'}{'hra'}{'draw'}  = 'LINE1';
@@ -461,5 +461,5 @@ foreach my $mgraph (sort keys(%data))
 }
 
 # for Munin Plugin Gallery
-# graph_category webserver
+# graph_category loadbalancer
 
diff --git a/plugins/squid/squid_efficiency b/plugins/squid/squid_efficiency
index 0e4a9ac8..6bbd28c4 100755
--- a/plugins/squid/squid_efficiency
+++ b/plugins/squid/squid_efficiency
@@ -60,7 +60,7 @@ port=${squidport:-3128}
 test "$1" = "config" && {
 	echo 'graph_title Squid Efficiency'
 	echo 'graph_info This graph shows the proxy efficiency over the last five mins.'
-	echo 'graph_category webserver'
+	echo 'graph_category loadbalancer'
 	echo "graph_args --lower-limit 0 --upper-limit 100"
 	echo 'graph_vlabel %'
 	echo 'request.label request hits'
diff --git a/plugins/squid/squid_times b/plugins/squid/squid_times
index 23f935e0..1a4b6d10 100755
--- a/plugins/squid/squid_times
+++ b/plugins/squid/squid_times
@@ -30,7 +30,7 @@ fi
 if [ "$1" = "config" ]; then
 	echo 'graph_title Squid Median Services Times'
 	echo 'graph_info This graph shows the proxy median services response times.'
-	echo 'graph_category webserver'
+	echo 'graph_category loadbalancer'
 	echo 'graph_args --lower-limit 0'
 	echo 'graph_vlabel median response times (s)'
 
diff --git a/plugins/virtualbox/virtualbox_cpu_kernel b/plugins/virtualbox/virtualbox_cpu_kernel
index d39db3fd..34551a9c 100755
--- a/plugins/virtualbox/virtualbox_cpu_kernel
+++ b/plugins/virtualbox/virtualbox_cpu_kernel
@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_vlabel %'
         echo 'graph_scale no'
         echo 'graph_info This graph shows the percentage of processor time spent in kernel mode by the every single VM process.'
-        echo 'graph_category Virtualization'
+        echo 'graph_category virtualization'
         echo 'graph_period second'
         vboxmanage list vms | sed -r 's/^\"(.*)\" \{.*\}$/\1/' | while read -r VM_NAME; do
                 VM_NAME_PRINT=$(echo -e "${VM_NAME}" | sed 's/[^A-Za-z0-9_]/_/g')
diff --git a/plugins/virtualbox/virtualbox_cpu_user b/plugins/virtualbox/virtualbox_cpu_user
index 33c1b469..a7e34e85 100755
--- a/plugins/virtualbox/virtualbox_cpu_user
+++ b/plugins/virtualbox/virtualbox_cpu_user
@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_vlabel %'
         echo 'graph_scale no'
         echo 'graph_info This graph shows the percentage of processor time spent in user mode by the every single VM process.'
-        echo 'graph_category Virtualization'
+        echo 'graph_category virtualization'
         echo 'graph_period second'
         vboxmanage list vms | sed -r 's/^\"(.*)\" \{.*\}$/\1/' | while read -r VM_NAME; do
                 VM_NAME_PRINT=$(echo -e "${VM_NAME}" | sed 's/[^A-Za-z0-9_]/_/g')
diff --git a/plugins/virtualbox/virtualbox_ram_usage b/plugins/virtualbox/virtualbox_ram_usage
index 6205c638..a96d7f2e 100755
--- a/plugins/virtualbox/virtualbox_ram_usage
+++ b/plugins/virtualbox/virtualbox_ram_usage
@@ -39,7 +39,7 @@ if [ "$1" = "config" ]; then
         echo "graph_args --base 1024 -r --lower-limit 0 --upper-limit $RAMTOT --units-exponent 9"
         echo 'graph_vlabel GB'
         echo 'graph_info This graph shows the ram usage of every single VM process.'
-        echo 'graph_category Virtualization'
+        echo 'graph_category virtualization'
         echo 'graph_period second'
         I=0
         vboxmanage list vms | sed -r 's/^\"(.*)\" \{.*\}$/\1/' | while read -r VM_NAME; do
diff --git a/plugins/voip/zapchans b/plugins/voip/zapchans
index bf2a41cb..aecbd11f 100755
--- a/plugins/voip/zapchans
+++ b/plugins/voip/zapchans
@@ -34,7 +34,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --upper-limit 22 -l 0'
 	echo 'graph_scale no'
 	echo 'graph_vlabel active connections'
-	echo 'graph_category VOIP'
+	echo 'graph_category voip'
 	echo 'graph_period second'
 	echo 'graph_info This graph shows the number of PRI lines in use.'
 	echo 'calls.label calls'
diff --git a/plugins/xen/xen b/plugins/xen/xen
index fe906f2c..e4f9abec 100755
--- a/plugins/xen/xen
+++ b/plugins/xen/xen
@@ -36,7 +36,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0 --upper-limit 100 --rigid'
         echo 'graph_scale no'
         echo 'graph_vlabel %'
-        echo 'graph_category Virtualization'
+        echo 'graph_category virtualization'
         echo 'graph_info This graph shows how many percent of the CPU time was used by each domain'
 
         xm list | grep -v "^Name .* Time(s)$" | while read -r name domid mem cpu state time console; do
diff --git a/plugins/xen/xen-cpu b/plugins/xen/xen-cpu
index 307c8076..90fabeaa 100755
--- a/plugins/xen/xen-cpu
+++ b/plugins/xen/xen-cpu
@@ -53,7 +53,7 @@ if (defined($ARGV[0])) {
 			'graph_title' => 'Xen Domain CPU Usage',
 			'graph_args' => '--base 1000 -l 0 --upper-limit 100 --rigid',
 			'graph_vlabel' => 'Percent (%)',
-			'graph_category' => 'Virtualization',
+			'graph_category' => 'virtualization',
 			'graph_info' => 'Display the % of CPU Usage for each domain',
 		);	
 
diff --git a/plugins/xen/xen-multi b/plugins/xen/xen-multi
index 233dfb5c..dafaa57a 100755
--- a/plugins/xen/xen-multi
+++ b/plugins/xen/xen-multi
@@ -169,7 +169,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_args --base 1000 -l 0\n";
 		print "graph_vlabel cpu seconds\n";
 		print "graph_scale no\n";
-		print "graph_category Virtualization\n";
+		print "graph_category virtualization\n";
 		print "graph_info This graph shows CPU time for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_cpu_time.label ".trim_label('pos',$domain)."\n";
@@ -186,7 +186,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_args --base 1000 -l 0 --upper-limit 100\n";
 		print "graph_vlabel %\n";
 		print "graph_scale no\n";
-		print "graph_category Virtualization\n";
+		print "graph_category virtualization\n";
 		print "graph_info This graph shows CPU utilization for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_cpu.label ".trim_label('pos',$domain)."\n";
@@ -199,7 +199,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_title Xen domains memory usage\n";
 		print "graph_args --base 1024 -l 0\n";
 		print "graph_vlabel bytes\n";
-		print "graph_category Virtualization\n";
+		print "graph_category virtualization\n";
 		print "graph_info This graph shows memory usage for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_mem.label ".trim_label('pos',$domain)."\n";
@@ -213,7 +213,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_title Xen domains network traffic\n";
 		print "graph_args --base 1000\n";
 		print "graph_vlabel bits per \${graph_period} in (-) / out (+)\n";
-		print "graph_category Virtualization\n";
+		print "graph_category virtualization\n";
 		print "graph_info This graph shows network traffic for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_netrx.label none\n";
@@ -233,7 +233,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_title Xen domains disk IOs\n";
 		print "graph_args --base 1000\n";
 		print "graph_vlabel IOs per \${graph_period} read (-) / write (+)\n";
-		print "graph_category Virtualization\n";
+		print "graph_category virtualization\n";
 		print "graph_info This graph shows disk IOs for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_vbdrd.label none\n";
diff --git a/plugins/xen/xen_cpu_v2 b/plugins/xen/xen_cpu_v2
index aa58184c..63e41248 100755
--- a/plugins/xen/xen_cpu_v2
+++ b/plugins/xen/xen_cpu_v2
@@ -72,7 +72,7 @@ if ( defined($ARGV[0]) )
 			'graph_title' => 'Xen Domain CPU Usage v2',
 			'graph_args' => '--base 1000 -l 0 --upper-limit 100 --rigid',
 			'graph_vlabel' => 'Percent (%)',
-			'graph_category' => 'Virtualization',
+			'graph_category' => 'virtualization',
 			'graph_info' => 'Display the % of CPU Usage for each domain',
 		);
 
diff --git a/plugins/xen/xen_memory b/plugins/xen/xen_memory
index 9fdc4d7b..90fbb56b 100755
--- a/plugins/xen/xen_memory
+++ b/plugins/xen/xen_memory
@@ -29,7 +29,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_scale no'
         echo 'graph_vlabel MB'
-        echo 'graph_category Virtualization'
+        echo 'graph_category virtualization'
         echo 'graph_info This graph shows of many mS wall time where used by a domain'
         "$XM" info | while read -r name bla value; do
                 # total_memory 2047
diff --git a/plugins/xen/xen_traffic_ b/plugins/xen/xen_traffic_
index 57e96a52..386320e9 100755
--- a/plugins/xen/xen_traffic_
+++ b/plugins/xen/xen_traffic_
@@ -33,7 +33,7 @@ if [ "$1" = "config" ]; then
     # shellcheck disable=SC2016
     echo 'graph_vlabel bits in (-) / out (+) per ${graph_period}'
     echo 'graph_args --base 1024 -l 0'
-    echo 'graph_category Virtualization'
+    echo 'graph_category virtualization'
     echo 'out.label sent'
     echo 'out.type DERIVE'
     echo 'out.min 0'
diff --git a/plugins/xen/xen_vbd b/plugins/xen/xen_vbd
index da34765a..1f74c24b 100755
--- a/plugins/xen/xen_vbd
+++ b/plugins/xen/xen_vbd
@@ -42,7 +42,7 @@ if ( defined($ARGV[0]))
                         'graph_title' => 'Xen Domain I/O usage',
                         'graph_args' => '--base 1024 -l 0',
                         'graph_vlabel' => 'read (-), write (+)',
-                        'graph_category' => 'Virtualization',
+                        'graph_category' => 'virtualization',
                         'graph_info' => 'Display the I/O operations for each domain',
                 );