From a3c2338b1f8e3aee48e403ce3b6e83a407fcb812 Mon Sep 17 00:00:00 2001
From: dipohl <contact@dipohl.de>
Date: Wed, 22 Feb 2017 03:29:26 +0100
Subject: [PATCH] Category Tree: reduce number of categories

---
 plugins/drbd/drbd                                    | 2 +-
 plugins/drbd/drbd-stat                               | 2 +-
 plugins/gearman/gearman_queue                        | 2 +-
 plugins/haproxy/haproxy-bytes                        | 2 +-
 plugins/haproxy/haproxy-connection-errors            | 2 +-
 plugins/haproxy/haproxy-downtime                     | 2 +-
 plugins/haproxy/haproxy-errors                       | 2 +-
 plugins/haproxy/haproxy-failed-checks                | 2 +-
 plugins/haproxy/haproxy-response-errors              | 2 +-
 plugins/haproxy/haproxy-sessions                     | 2 +-
 plugins/haproxy/haproxy-sessions-by-servers          | 2 +-
 plugins/haproxy/haproxy_abort_backend                | 2 +-
 plugins/haproxy/haproxy_active_backend               | 2 +-
 plugins/haproxy/haproxy_bytes_backend                | 2 +-
 plugins/haproxy/haproxy_bytes_compressor_backend     | 2 +-
 plugins/haproxy/haproxy_bytes_compressor_frontend    | 2 +-
 plugins/haproxy/haproxy_bytes_frontend               | 2 +-
 plugins/haproxy/haproxy_denied_backend               | 2 +-
 plugins/haproxy/haproxy_denied_frontend              | 2 +-
 plugins/haproxy/haproxy_errors_backend               | 2 +-
 plugins/haproxy/haproxy_errors_frontend              | 2 +-
 plugins/haproxy/haproxy_queue_backend                | 2 +-
 plugins/haproxy/haproxy_rate_backend                 | 2 +-
 plugins/haproxy/haproxy_rate_frontend                | 2 +-
 plugins/haproxy/haproxy_reqrate_frontend             | 2 +-
 plugins/haproxy/haproxy_response_compressor_backend  | 2 +-
 plugins/haproxy/haproxy_response_compressor_frontend | 2 +-
 plugins/haproxy/haproxy_responses_backend            | 2 +-
 plugins/haproxy/haproxy_responses_frontend           | 2 +-
 plugins/haproxy/haproxy_sessions_backend             | 2 +-
 plugins/haproxy/haproxy_sessions_frontend            | 2 +-
 plugins/haproxy/haproxy_sessions_total_backend       | 2 +-
 plugins/haproxy/haproxy_sessions_total_frontend      | 2 +-
 plugins/haproxy/haproxy_warnings_backend             | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/plugins/drbd/drbd b/plugins/drbd/drbd
index 63c5a02b..4216902e 100755
--- a/plugins/drbd/drbd
+++ b/plugins/drbd/drbd
@@ -14,7 +14,7 @@ my $temp;
 sub display{
 	if ($ARGV[0] and $ARGV[0] eq "config"){
 		print "graph_title DRBD\n";
-		print "graph_category DRBD\n";
+		print "graph_category disk\n";
 		print "graph_info Graph DRBD\n";
 		print "graph_vlabel Bytes per \${graph_period} read (-) / written (+)\n";
 		print "graph_args --base 1024 --lower-limit 0\n";
diff --git a/plugins/drbd/drbd-stat b/plugins/drbd/drbd-stat
index 58d91c9f..2a6e7259 100755
--- a/plugins/drbd/drbd-stat
+++ b/plugins/drbd/drbd-stat
@@ -15,7 +15,7 @@ my $temp;
 sub display{
 	if ($ARGV[0] and $ARGV[0] eq "config"){
 		print "graph_title DRBD\n";
-		print "graph_category DRBD\n";
+		print "graph_category disk\n";
 		print "graph_info Graph DRBD\n";
 		print "graph_vlabel Graph DRBD\n";
 		#print "graph_scale no\n";
diff --git a/plugins/gearman/gearman_queue b/plugins/gearman/gearman_queue
index 1c37baf1..d24120e1 100755
--- a/plugins/gearman/gearman_queue
+++ b/plugins/gearman/gearman_queue
@@ -27,7 +27,7 @@ if (defined $ARGV[0] and $ARGV[0] eq 'config') {
 	print "graph_title Gearman queue\n";
 	print "graph_args --base 1000\n";
 	print "graph_vlabel jobs\n";
-	print "graph_category Gearman\n";
+	print "graph_category other\n";
 	while ( my ($key, $value) = each(%$gearman) ) {
 		my $param = $key."_"."queue";
 		print "$param.type GAUGE\n";
diff --git a/plugins/haproxy/haproxy-bytes b/plugins/haproxy/haproxy-bytes
index b719c95e..303a849e 100755
--- a/plugins/haproxy/haproxy-bytes
+++ b/plugins/haproxy/haproxy-bytes
@@ -30,7 +30,7 @@ graph_vlabel=${title}
 case $1 in
    config)
 		cat <<EOF
-graph_category haproxy
+graph_category loadbalancer 
 graph_args --base 1000
 graph_title  ${graph_title}
 graph_vlabel ${graph_vlabel}
diff --git a/plugins/haproxy/haproxy-connection-errors b/plugins/haproxy/haproxy-connection-errors
index aefb3397..341fbc9c 100755
--- a/plugins/haproxy/haproxy-connection-errors
+++ b/plugins/haproxy/haproxy-connection-errors
@@ -31,7 +31,7 @@ graph_vlabel=${title}
 case $1 in
    config)
 		cat <<EOF
-graph_category haproxy
+graph_category loadbalancer
 graph_title  ${graph_title}
 graph_vlabel ${graph_vlabel}
 
diff --git a/plugins/haproxy/haproxy-downtime b/plugins/haproxy/haproxy-downtime
index cf4f7318..2a1f87ec 100755
--- a/plugins/haproxy/haproxy-downtime
+++ b/plugins/haproxy/haproxy-downtime
@@ -30,7 +30,7 @@ graph_vlabel=${title}
 case $1 in
    config)
 		cat <<EOF
-graph_category haproxy
+graph_category loadbalancer
 graph_title  ${graph_title}
 graph_vlabel ${graph_vlabel}
 
diff --git a/plugins/haproxy/haproxy-errors b/plugins/haproxy/haproxy-errors
index 03cb98b2..d9f27ea1 100755
--- a/plugins/haproxy/haproxy-errors
+++ b/plugins/haproxy/haproxy-errors
@@ -37,7 +37,7 @@ graph_vlabel=${title}
 case $1 in
    config)
 		cat <<EOF
-graph_category haproxy
+graph_category loadbalancer
 graph_title  ${graph_title}
 graph_vlabel ${graph_vlabel}
 
diff --git a/plugins/haproxy/haproxy-failed-checks b/plugins/haproxy/haproxy-failed-checks
index f161e8b0..22c12af7 100755
--- a/plugins/haproxy/haproxy-failed-checks
+++ b/plugins/haproxy/haproxy-failed-checks
@@ -31,7 +31,7 @@ graph_vlabel=${title}
 case $1 in
    config)
 		cat <<EOF
-graph_category haproxy
+graph_category loadbalancer
 graph_title  ${graph_title}
 graph_vlabel ${graph_vlabel}
 
diff --git a/plugins/haproxy/haproxy-response-errors b/plugins/haproxy/haproxy-response-errors
index 6d18630c..3df66598 100755
--- a/plugins/haproxy/haproxy-response-errors
+++ b/plugins/haproxy/haproxy-response-errors
@@ -31,7 +31,7 @@ graph_vlabel=${title}
 case $1 in
    config)
 		cat <<EOF
-graph_category haproxy
+graph_category loadbalancer
 graph_title  ${graph_title}
 graph_vlabel ${graph_vlabel}
 
diff --git a/plugins/haproxy/haproxy-sessions b/plugins/haproxy/haproxy-sessions
index 5cceb065..6f442541 100755
--- a/plugins/haproxy/haproxy-sessions
+++ b/plugins/haproxy/haproxy-sessions
@@ -32,7 +32,7 @@ graph_vlabel=${title}
 case $1 in
    config)
 		cat <<EOF
-graph_category haproxy
+graph_category loadbalancer
 graph_title  ${graph_title}
 graph_vlabel ${graph_vlabel}
 
diff --git a/plugins/haproxy/haproxy-sessions-by-servers b/plugins/haproxy/haproxy-sessions-by-servers
index d731ad1a..76ea9273 100755
--- a/plugins/haproxy/haproxy-sessions-by-servers
+++ b/plugins/haproxy/haproxy-sessions-by-servers
@@ -83,7 +83,7 @@ fi
 
 if [ "$1" = "config" ]; then
 
-	echo "graph_category haproxy"
+	echo "graph_category loadbalancer"
 	echo "graph_title  ${graph_title}"
 	echo "graph_vlabel ${graph_vlabel}"
 	#echo "graph_printf %.0f"
diff --git a/plugins/haproxy/haproxy_abort_backend b/plugins/haproxy/haproxy_abort_backend
index 68fc33f2..a51f0a0f 100755
--- a/plugins/haproxy/haproxy_abort_backend
+++ b/plugins/haproxy/haproxy_abort_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Aborts'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Aborts ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_active_backend b/plugins/haproxy/haproxy_active_backend
index 70fce73b..e28d02dd 100755
--- a/plugins/haproxy/haproxy_active_backend
+++ b/plugins/haproxy/haproxy_active_backend
@@ -84,7 +84,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Servers'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Active Servers ${SVNAME}"
 
 	for i in ${LIST}; do
diff --git a/plugins/haproxy/haproxy_bytes_backend b/plugins/haproxy/haproxy_bytes_backend
index c5d45d81..3d8d4c92 100755
--- a/plugins/haproxy/haproxy_bytes_backend
+++ b/plugins/haproxy/haproxy_bytes_backend
@@ -84,7 +84,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Bytes ${SVNAME}"
 	echo 'graph_args --base 1000'
 	echo 'graph_vlabel Bytes in (-) / out (+)'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Bytes ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_bytes_compressor_backend b/plugins/haproxy/haproxy_bytes_compressor_backend
index e8ea51ec..90350eca 100755
--- a/plugins/haproxy/haproxy_bytes_compressor_backend
+++ b/plugins/haproxy/haproxy_bytes_compressor_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Bytes'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Bytes compressor ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_bytes_compressor_frontend b/plugins/haproxy/haproxy_bytes_compressor_frontend
index e99fdfbe..780d035a 100755
--- a/plugins/haproxy/haproxy_bytes_compressor_frontend
+++ b/plugins/haproxy/haproxy_bytes_compressor_frontend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Bytes'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Bytes compressor ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_bytes_frontend b/plugins/haproxy/haproxy_bytes_frontend
index fb78bc1c..831c6018 100755
--- a/plugins/haproxy/haproxy_bytes_frontend
+++ b/plugins/haproxy/haproxy_bytes_frontend
@@ -84,7 +84,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Bytes ${SVNAME}"
 	echo 'graph_args --base 1000'
 	echo 'graph_vlabel Bytes in (-) / out (+)'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Bytes ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_denied_backend b/plugins/haproxy/haproxy_denied_backend
index 5ff8cbe4..09a084ee 100755
--- a/plugins/haproxy/haproxy_denied_backend
+++ b/plugins/haproxy/haproxy_denied_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Requests and Responses'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Denied Requests / Responses ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_denied_frontend b/plugins/haproxy/haproxy_denied_frontend
index 3a5bde42..c8f47189 100755
--- a/plugins/haproxy/haproxy_denied_frontend
+++ b/plugins/haproxy/haproxy_denied_frontend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Requests and Responses'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Denied Requests / Responses ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_errors_backend b/plugins/haproxy/haproxy_errors_backend
index 36303309..a6a702a3 100755
--- a/plugins/haproxy/haproxy_errors_backend
+++ b/plugins/haproxy/haproxy_errors_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Errors'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Errors ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_errors_frontend b/plugins/haproxy/haproxy_errors_frontend
index d01005d5..8e43f853 100755
--- a/plugins/haproxy/haproxy_errors_frontend
+++ b/plugins/haproxy/haproxy_errors_frontend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Errors'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Errors ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_queue_backend b/plugins/haproxy/haproxy_queue_backend
index 9b2ef1b5..3315ed5e 100755
--- a/plugins/haproxy/haproxy_queue_backend
+++ b/plugins/haproxy/haproxy_queue_backend
@@ -88,7 +88,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Queued'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Queue Requests ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_rate_backend b/plugins/haproxy/haproxy_rate_backend
index e369ebe4..4e66e3ee 100755
--- a/plugins/haproxy/haproxy_rate_backend
+++ b/plugins/haproxy/haproxy_rate_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Sessions'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Sessions per second ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_rate_frontend b/plugins/haproxy/haproxy_rate_frontend
index 5ab81ac3..184d6bd8 100755
--- a/plugins/haproxy/haproxy_rate_frontend
+++ b/plugins/haproxy/haproxy_rate_frontend
@@ -87,7 +87,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Sessions'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Sessions per second ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_reqrate_frontend b/plugins/haproxy/haproxy_reqrate_frontend
index c1cf9bb5..60b5fe26 100755
--- a/plugins/haproxy/haproxy_reqrate_frontend
+++ b/plugins/haproxy/haproxy_reqrate_frontend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Requests'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Request Rate ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_response_compressor_backend b/plugins/haproxy/haproxy_response_compressor_backend
index b311f13a..753b20d4 100755
--- a/plugins/haproxy/haproxy_response_compressor_backend
+++ b/plugins/haproxy/haproxy_response_compressor_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Responses'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info HTTP responses that were compressed ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_response_compressor_frontend b/plugins/haproxy/haproxy_response_compressor_frontend
index 62540ac0..05a65972 100755
--- a/plugins/haproxy/haproxy_response_compressor_frontend
+++ b/plugins/haproxy/haproxy_response_compressor_frontend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Responses'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info HTTP responses that were compressed ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_responses_backend b/plugins/haproxy/haproxy_responses_backend
index 2191e449..1b934a92 100755
--- a/plugins/haproxy/haproxy_responses_backend
+++ b/plugins/haproxy/haproxy_responses_backend
@@ -85,7 +85,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Responses'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info HTTP Responses ${SVNAME}"
 
 	for i in ${LIST}; do
diff --git a/plugins/haproxy/haproxy_responses_frontend b/plugins/haproxy/haproxy_responses_frontend
index e4f6537f..d49b2511 100755
--- a/plugins/haproxy/haproxy_responses_frontend
+++ b/plugins/haproxy/haproxy_responses_frontend
@@ -85,7 +85,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Responses'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info HTTP Responses ${SVNAME}"
 
 	for i in ${LIST}; do
diff --git a/plugins/haproxy/haproxy_sessions_backend b/plugins/haproxy/haproxy_sessions_backend
index e4a23e60..2aaa406a 100755
--- a/plugins/haproxy/haproxy_sessions_backend
+++ b/plugins/haproxy/haproxy_sessions_backend
@@ -87,7 +87,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Sessions'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Current sessions ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_sessions_frontend b/plugins/haproxy/haproxy_sessions_frontend
index d41e26a3..9d103bc0 100755
--- a/plugins/haproxy/haproxy_sessions_frontend
+++ b/plugins/haproxy/haproxy_sessions_frontend
@@ -87,7 +87,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Sessions'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Current sessions ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_sessions_total_backend b/plugins/haproxy/haproxy_sessions_total_backend
index 629eec4f..48755265 100755
--- a/plugins/haproxy/haproxy_sessions_total_backend
+++ b/plugins/haproxy/haproxy_sessions_total_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Sessions'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Total sessions ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_sessions_total_frontend b/plugins/haproxy/haproxy_sessions_total_frontend
index cce846a2..d1b8d7a8 100755
--- a/plugins/haproxy/haproxy_sessions_total_frontend
+++ b/plugins/haproxy/haproxy_sessions_total_frontend
@@ -87,7 +87,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Sessions'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Total sessions ${SVNAME}"
 
 
diff --git a/plugins/haproxy/haproxy_warnings_backend b/plugins/haproxy/haproxy_warnings_backend
index 0af79282..a6b6aa14 100755
--- a/plugins/haproxy/haproxy_warnings_backend
+++ b/plugins/haproxy/haproxy_warnings_backend
@@ -86,7 +86,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Warnings'
 	echo 'graph_scale no'
-	echo 'graph_category haproxy'
+	echo 'graph_category loadbalancer'
 	echo "graph_info Warnings ${SVNAME}"