Merge branch 'categories'

Reduce number of categories

plugins/ceph/ceph-osd-info

@@ -183,3 +183,6 @@ else:
 				print "multigraph %s.osd%s" % (gr,osd)
 				print "osd%s_%s.value %s" % (osd,gr,data[osd][graph])
 
+# for Munin Plugin Gallery
+# graph_category ceph
+

plugins/icecast/icecast2_stats_

@@ -151,20 +151,20 @@ if __name__ == "__main__":
         if scope == "sources_listeners":
             print("graph_title Total number of listeners")
             print("graph_vlabel listeners")
-            print("graph_category Icecast")
+            print("graph_category streaming")
             for index, source in enumerate(get_sources()):
                 print("{0}.label {1}".format(source["fieldname"], source["name"]))
                 print("{0}.draw {1}".format(source["fieldname"], ("AREA" if (index == 0) else "STACK")))
         elif scope == "sources_duration":
             print("graph_title Duration of sources")
             print("graph_vlabel duration in days")
-            print("graph_category Icecast")
+            print("graph_category streaming")
             for source in get_sources():
                 print("{0}.label {1}".format(source["fieldname"], source["name"]))
         elif scope == "service_uptime":
             print("graph_title Icecast service uptime")
             print("graph_vlabel uptime in days")
-            print("graph_category Icecast")
+            print("graph_category streaming")
             print("uptime.label service uptime")
     elif action is None:
         scope = get_scope()

plugins/moodle/moodle_mod_chat

@@ -38,7 +38,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
     echo "graph_title Moodle Chat Users\n";
     echo "graph_args --base 1000 --lower-limit 0\n";
     echo "graph_vlabel users\n";
-    echo "graph_category Moodle\n";
+    echo "graph_category cms\n";
     echo "graph_scale no\n";
     echo "graph_info Displays the number of users connected and posting message in chat sessions\n";
     echo "chat_users_connected.label users connected\n";

plugins/moodle/moodle_mod_forum

@@ -39,7 +39,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
     echo "graph_title Moodle Forum Posts\n";
     echo "graph_args --base 1000 --lower-limit 0\n";
     echo "graph_vlabel number\n";
-    echo "graph_category Moodle\n";
+    echo "graph_category cms\n";
     echo "graph_scale no\n";
     echo "graph_info Displays the sum of new forums posts / discussions in your Moodle site\n";
     echo "forum_posts.label posts\n";

plugins/moodle/moodle_mod_quiz

@@ -39,7 +39,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
     echo "graph_title Moodle Quiz Attempts\n";
     echo "graph_args --base 1000 --lower-limit 0\n";
     echo "graph_vlabel attempts\n";
-    echo "graph_category Moodle\n";
+    echo "graph_category cms\n";
     echo "graph_scale no\n";
     echo "graph_info Displays the sum quiz attempts in your Moodle site\n";
     echo "quiz_attempts.label attempts\n";

plugins/postfix/postfwd2

@@ -199,7 +199,7 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq 'config') ) {
         print 'graph_vlabel ', $graphs{$key}->{vlabel}, "\n";
         my $args = ($key eq 'cache_stats') ? ' --upper-limit 100 --rigid' : '';
         print 'graph_args --lower-limit 0', $args, "\n";
-        print 'graph_category mail', "\n";
+        print 'graph_category fw', "\n";
         if ($key eq 'policy_matchs') {
             print 'graph_width 600', "\n";
             my @pol_keys = sort { $graphs{$key}->{series}->{$b}->{value} <=> $graphs{$key}->{series}->{$a}->{value} } keys %{$graphs{$key}->{series}};
@@ -214,7 +214,7 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq 'config') ) {
                 print 'graph_vlabel ', $graphs{$key}->{vlabel}, "\n";
                 print 'graph_width 600', "\n";
                 print 'graph_args --lower-limit 0 ', $args, "\n";
-                print 'graph_category other', "\n";
+                print 'graph_category fw', "\n";
                 print $label, '.label ', $graphs{$key}->{series}->{$label}->{label}, "\n";
                 print $label, '.draw LINE', "\n";
                 print $label, '.type GAUGE', "\n";

plugins/shoutcast/shoutcast2_multi

@@ -78,7 +78,7 @@ $graphsRef->{active} = {
 	config => {
 		args => '--base 1000 --lower-limit 0',
 		vlabel => 'Is a DJ Actively Connected?',
-		category => 'shoutcast2',
+		category => 'streaming',
 		title => 'Active States',
 		info => 'This graph shows us the active state or not, depending on if a DJ is connected',
 	},
@@ -91,7 +91,7 @@ $graphsRef->{listeners} = {
 	config => {
 		args => '--base 1000 --lower-limit 0',
 		vlabel => 'Listener Count',
-		category => 'shoutcast2',
+		category => 'streaming',
 		title => 'Listeners',
 		info => 'This graph shows us the various counts for listener states we are tracking',
 	},
@@ -440,3 +440,5 @@ sub fetch_admin_data {
 	}
 }
 
+# for Munin Plugin Gallery
+# graph_category streaming