From 0147f805740695b13c9d2c627152b10211897f63 Mon Sep 17 00:00:00 2001
From: dipohl <contact@dipohl.de>
Date: Thu, 23 Feb 2017 03:20:34 +0100
Subject: [PATCH] Category Tree: Reduce number of categories jenkins -> devel
 sickbeard -> other (sickbeard) swift -> fs (swift) [or better disk, storage,
 appserver?] tarsnap -> backup (tarsnap) tv -> sensors (tv)

---
 plugins/jenkins/jenkins_              | 6 +++---
 plugins/jenkins/jenkins_nodes_        | 4 ++--
 plugins/sickbeard/sickbeard_episodes  | 2 +-
 plugins/sickbeard/sickbeard_shows     | 2 +-
 plugins/swift/swift-async_            | 2 +-
 plugins/swift/swift-dispersion        | 2 +-
 plugins/swift/swift-quarantined_      | 2 +-
 plugins/swift/swift-replication-time_ | 2 +-
 plugins/tarsnap/tarsnap               | 4 ++--
 plugins/tv/hdhomerun_                 | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/jenkins/jenkins_ b/plugins/jenkins/jenkins_
index 7dd34068..9680030a 100644
--- a/plugins/jenkins/jenkins_
+++ b/plugins/jenkins/jenkins_
@@ -86,7 +86,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
     	print "graph_args --base 1000 -l 0\n";
     	print "graph_title Jenkins Build Results\n";
     	print "graph_vlabel Build Results\n";
-    	print "graph_category Jenkins\n";
+    	print "graph_category devel\n";
     	print "graph_info The Graph shows the Status of each Build\n";
     	print "build_disabled.draw AREA\n";
     	print "build_disabled.label disabled\n";
@@ -110,7 +110,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
 		print "graph_args --base 1000 -l 0\n";
     	print "graph_title Jenkins Queue Length\n";
     	print "graph_vlabel Number of Jobs in Queue\n";
-    	print "graph_category Jenkins\n";
+    	print "graph_category devel\n";
     	print "graph_info The Graph shows the Number of Jobs in the Build Queue\n";
     	print "build_count.label Jobs in Queue\n";
     	print "build_count.type GAUGE\n";
@@ -120,7 +120,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
 		print "graph_args --base 1000 -l 0\n";
     	print "graph_title Jenkins Builds Running\n";
     	print "graph_vlabel Builds currently running\n";
-    	print "graph_category Jenkins\n";
+    	print "graph_category devel\n";
     	print "graph_info The Graph shows the Number of Builds, currently running\n";
     	print "build_running.label running Builds\n";
     	print "build_running.type GAUGE\n";
diff --git a/plugins/jenkins/jenkins_nodes_ b/plugins/jenkins/jenkins_nodes_
index 20ce41fa..8293caed 100644
--- a/plugins/jenkins/jenkins_nodes_
+++ b/plugins/jenkins/jenkins_nodes_
@@ -25,7 +25,7 @@ my $cmd = "$wgetBin $auth -qO- $url:$port$context";
 my $monitor;
 
 if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
-    my $base_config = "graph_category Jenkins\n";
+    my $base_config = "graph_category devel\n";
 
     if( $type eq "mem_sum" ) {
             print $base_config;
@@ -271,4 +271,4 @@ sub clean_name {
     $name =~ s/\)/\_/g;
     $name =~ s/ //g;
     return $name;
-}
\ No newline at end of file
+}
diff --git a/plugins/sickbeard/sickbeard_episodes b/plugins/sickbeard/sickbeard_episodes
index decb9266..8b297006 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 Sick-Beard
+graph_category other
 down.label Downloaded
 snatched.label Snatched
 total.label Total
diff --git a/plugins/sickbeard/sickbeard_shows b/plugins/sickbeard/sickbeard_shows
index a81c6bd8..9d334f50 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 Sick-Beard
+graph_category other
 active.label Active
 total.label Total
 EOC
diff --git a/plugins/swift/swift-async_ b/plugins/swift/swift-async_
index a39f7298..0e10c90d 100755
--- a/plugins/swift/swift-async_
+++ b/plugins/swift/swift-async_
@@ -35,7 +35,7 @@ except:
 try:
     if sys.argv[1] == 'config':
         print "graph_title Swift object async pending %s" % swift_server
-        print "graph_category swift"
+        print "graph_category fs"
         print "async_pending.type GAUGE"
         print "async_pending.label Async pending"
         print "async_pending.draw AREA"
diff --git a/plugins/swift/swift-dispersion b/plugins/swift/swift-dispersion
index 08d10249..99538b77 100755
--- a/plugins/swift/swift-dispersion
+++ b/plugins/swift/swift-dispersion
@@ -28,7 +28,7 @@ import json
 try:
     if sys.argv[1] == "config":
         print 'graph_title Swift cluster dispersion'
-        print 'graph_category swift'
+        print 'graph_category fs'
 
         print 'object_missing_two.type GAUGE'
         print 'object_missing_two.label Objects missing two copies'
diff --git a/plugins/swift/swift-quarantined_ b/plugins/swift/swift-quarantined_
index 6757e040..5315d573 100755
--- a/plugins/swift/swift-quarantined_
+++ b/plugins/swift/swift-quarantined_
@@ -35,7 +35,7 @@ except:
 try:
     if sys.argv[1] == 'config':
         print "graph_title Swift objects quarantined %s" % swift_server
-        print "graph_category swift"
+        print "graph_category fs"
         print "quarantined_objects.type GAUGE"
         print "quarantined_objects.draw AREA"
         print "quarantined_objects.label Quarantined objects"
diff --git a/plugins/swift/swift-replication-time_ b/plugins/swift/swift-replication-time_
index ce87e04d..f8380053 100755
--- a/plugins/swift/swift-replication-time_
+++ b/plugins/swift/swift-replication-time_
@@ -35,7 +35,7 @@ except:
 try:
     if sys.argv[1] == 'config':
         print "graph_title Swift object replication time %s" % swift_server
-        print "graph_category swift"
+        print "graph_category fs"
         print "graph_vlabel Time"
         print "object_replication_time.type GAUGE"
         print "object_replication_time.label Replication time"
diff --git a/plugins/tarsnap/tarsnap b/plugins/tarsnap/tarsnap
index 44e0e677..a5633cff 100755
--- a/plugins/tarsnap/tarsnap
+++ b/plugins/tarsnap/tarsnap
@@ -37,14 +37,14 @@ case $1 in
 multigraph tarsnap_total
 graph_title Tarsnap total data
 graph_vlabel bytes
-graph_category tarsnap
+graph_category backup 
 total_size.label Total size
 total_compressed.label Total size (compressed)
 
 multigraph tarsnap_unique
 graph_title Tarsnap unique data
 graph_vlabel bytes
-graph_category tarsnap
+graph_category backup
 unique_size.label Unique data
 unique_compressed.label Unique data (compressed)
 EOM
diff --git a/plugins/tv/hdhomerun_ b/plugins/tv/hdhomerun_
index d6267422..2fafe0ff 100755
--- a/plugins/tv/hdhomerun_
+++ b/plugins/tv/hdhomerun_
@@ -50,7 +50,7 @@ if [ "$1" = "config" ] ; then
 	echo "graph_args --upper-limit 100 -l 0"
 	echo "graph_vlabel %"
 	echo "graph_scale no"
-	echo "graph_category tv"
+	echo "graph_category sensors"
 	echo "ss.label Signal Strength"
 	echo "snq.label Signal Quality"
 	echo "seq.label Symbol Quality"