Merge branch 'categories'

power5 -> cpu

plugins/funkytown/denon_x311_volume

@@ -32,7 +32,7 @@
 BEGIN {
 	if (ARGV[1] == "config") {
 		print "graph_title Denon AVR-4311 Volume"
-		print "graph_category funkytown"
+		print "graph_category radio"
 		print "volume.label Volume"
 		print "volume.type GAUGE"
 		exit 0

plugins/power5/consumed_cpu_cycles

@@ -40,7 +40,7 @@ fi
 if [ "$1" = "config" ]; then
 	echo 'graph_title Consumed CPU cycles'
 	echo 'graph_args -l 0'
-	echo 'graph_category Power5'
+	echo 'graph_category cpu'
 	echo 'graph_vlabel CPU cycles'
 	echo 'graph_info This graph shows the CPU cycles on an uncapped LPAR'
 	

plugins/power5/cpu_entitlemens

@@ -39,7 +39,7 @@ fi
 if [ "$1" = "config" ]; then
 	echo 'graph_title CPU entitlements'
 	echo 'graph_args -l 0'
-	echo 'graph_category Power5'
+	echo 'graph_category cpu'
 	echo 'graph_vlabel entitlements'
 	echo 'graph_info This graph shows the actual and max entitlements for a LPAR'
 

plugins/power5/cpu_in_lpar

@@ -38,7 +38,7 @@ fi
 if [ "$1" = "config" ]; then
 	echo 'graph_title CPU in LPAR'
 	echo 'graph_args -l 0'
-	echo 'graph_category Power5'
+	echo 'graph_category cpu'
 	echo 'graph_vlabel CPUs in LPAR'
 	echo 'graph_info This graph shows potential and active processors for a LPAR.'
 	

plugins/power5/weight_of_a_lpar

@@ -38,7 +38,7 @@ fi
 if [ "$1" = "config" ]; then
 	echo 'graph_title Weight of an uncapped LPAR'
 	echo 'graph_args -l 0'
-	echo 'graph_category Power5'
+	echo 'graph_category cpu'
 	echo 'graph_vlabel Weight of LPAR'
 	echo 'graph_info This graph shows the weight of an uncapped LPAR'
 	echo 'weight.min 0'

plugins/proftpd/proftpd

@@ -6,7 +6,7 @@
 if [ "$1" = 'config' ]; then
         echo "graph_args --base 1000 -l 0"
         echo "graph_title Serveur FTP"
-        echo "graph_category Ftp"
+        echo "graph_category ftp"
         echo "graph_vlabel Stats Proftpd"
         echo "succes.label Login succes"
         echo "succes.draw AREA"

plugins/proftpd/proftpd_bytes

@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title FTP Server Bytes'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel FTP Server Bytes'
-	echo 'graph_category FTP'
+	echo 'graph_category ftp'
         echo 'ftp_get.label Bytes GET'
         echo 'ftp_put.label Bytes PUT'
         exit 0

plugins/proftpd/proftpd_count

@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title FTP Server Transfers'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel FTP Server Transfers'
-	echo 'graph_category FTP'
+	echo 'graph_category ftp'
         echo 'ftp_get.label Files GET'
         echo 'ftp_put.label Files PUT'
         exit 0

plugins/pure-ftpd/pureftpd_count

@@ -30,7 +30,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title FTP Server'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Daily FTP Operations'
-        echo 'graph_category FTP'
+        echo 'graph_category ftp'
         echo 'graph_period second'
         echo 'ftp_put.type GAUGE'
         echo 'ftp_get.type GAUGE'