From c0568802bf53c5b9958eaa3b41a4b8355e7b00d4 Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 21:14:01 +0100 Subject: [PATCH] Reduce number of categories, move "other" plugins --- plugins/{other => approx}/approx | 0 plugins/celery/celery_tasks | 2 +- plugins/celery/celery_tasks_states | 2 +- plugins/{network => cisco}/cisco_bgp_ | 0 plugins/{other => horde}/horde | 1 + plugins/{other => i2p}/i2p_ | 0 plugins/network/radio | 2 +- plugins/other/listeners | 2 ++ plugins/{network => pf}/pf | 0 plugins/{network => pf}/pf_bytes | 0 plugins/{network => pf}/pf_ipv4_ipv6_packets | 0 plugins/{network => pf}/pf_openbsd | 0 plugins/{network => pf}/pf_packets | 0 plugins/{network => pf}/pf_states | 0 plugins/{network => pf}/pf_tables_ | 4 ++-- plugins/{other => ssh}/sshd_log | 0 16 files changed, 8 insertions(+), 5 deletions(-) rename plugins/{other => approx}/approx (100%) rename plugins/{network => cisco}/cisco_bgp_ (100%) rename plugins/{other => horde}/horde (97%) rename plugins/{other => i2p}/i2p_ (100%) rename plugins/{network => pf}/pf (100%) rename plugins/{network => pf}/pf_bytes (100%) rename plugins/{network => pf}/pf_ipv4_ipv6_packets (100%) rename plugins/{network => pf}/pf_openbsd (100%) rename plugins/{network => pf}/pf_packets (100%) rename plugins/{network => pf}/pf_states (100%) rename plugins/{network => pf}/pf_tables_ (98%) rename plugins/{other => ssh}/sshd_log (100%) diff --git a/plugins/other/approx b/plugins/approx/approx similarity index 100% rename from plugins/other/approx rename to plugins/approx/approx diff --git a/plugins/celery/celery_tasks b/plugins/celery/celery_tasks index d70e7994..6a505743 100755 --- a/plugins/celery/celery_tasks +++ b/plugins/celery/celery_tasks @@ -97,7 +97,7 @@ def print_config(task_names): print 'graph_args --lower-limit 0' print 'graph_scale no' print 'graph_vlabel tasks per ${graph_period}' - print 'graph_category celery' + print 'graph_category other' for name in task_names: print '%s.label %s' % (clean_task_name(name), name) diff --git a/plugins/celery/celery_tasks_states b/plugins/celery/celery_tasks_states index 0198d7ef..1663d76a 100755 --- a/plugins/celery/celery_tasks_states +++ b/plugins/celery/celery_tasks_states @@ -103,7 +103,7 @@ def print_config(workers = None): print 'graph_args --lower-limit 0' print 'graph_scale no' print 'graph_vlabel tasks per ${graph_period}' - print 'graph_category celery' + print 'graph_category other' for name in TASK_STATES: name = clean_state_name(name) diff --git a/plugins/network/cisco_bgp_ b/plugins/cisco/cisco_bgp_ similarity index 100% rename from plugins/network/cisco_bgp_ rename to plugins/cisco/cisco_bgp_ diff --git a/plugins/other/horde b/plugins/horde/horde similarity index 97% rename from plugins/other/horde rename to plugins/horde/horde index 6fb91ea3..662ab046 100755 --- a/plugins/other/horde +++ b/plugins/horde/horde @@ -45,6 +45,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title horde3' + echo 'graph_category appserver' echo 'graph_info This graph shows Horde3 logins, logouts and errors.' echo 'graph_vlabel per hour' echo 'logins.label logins' diff --git a/plugins/other/i2p_ b/plugins/i2p/i2p_ similarity index 100% rename from plugins/other/i2p_ rename to plugins/i2p/i2p_ diff --git a/plugins/network/radio b/plugins/network/radio index 1c815823..4534506e 100755 --- a/plugins/network/radio +++ b/plugins/network/radio @@ -98,7 +98,7 @@ switch( $argv[1] ) { case "config": echo "graph_title Stream Listeners\n"; - echo "graph_category Network\n"; + echo "graph_category streaming\n"; echo "graph_vlabel listeners\n"; echo "graph_hlabel listeners\n"; echo "graph_args --base 1000 -l 0\n"; diff --git a/plugins/other/listeners b/plugins/other/listeners index 44d9fa7a..8f426d36 100755 --- a/plugins/other/listeners +++ b/plugins/other/listeners @@ -116,3 +116,5 @@ run_() { # plugin entry point: run_$1 +# for Munin Plugin Gallery +# graph_category streaming diff --git a/plugins/network/pf b/plugins/pf/pf similarity index 100% rename from plugins/network/pf rename to plugins/pf/pf diff --git a/plugins/network/pf_bytes b/plugins/pf/pf_bytes similarity index 100% rename from plugins/network/pf_bytes rename to plugins/pf/pf_bytes diff --git a/plugins/network/pf_ipv4_ipv6_packets b/plugins/pf/pf_ipv4_ipv6_packets similarity index 100% rename from plugins/network/pf_ipv4_ipv6_packets rename to plugins/pf/pf_ipv4_ipv6_packets diff --git a/plugins/network/pf_openbsd b/plugins/pf/pf_openbsd similarity index 100% rename from plugins/network/pf_openbsd rename to plugins/pf/pf_openbsd diff --git a/plugins/network/pf_packets b/plugins/pf/pf_packets similarity index 100% rename from plugins/network/pf_packets rename to plugins/pf/pf_packets diff --git a/plugins/network/pf_states b/plugins/pf/pf_states similarity index 100% rename from plugins/network/pf_states rename to plugins/pf/pf_states diff --git a/plugins/network/pf_tables_ b/plugins/pf/pf_tables_ similarity index 98% rename from plugins/network/pf_tables_ rename to plugins/pf/pf_tables_ index 0f3975ae..b0caf141 100644 --- a/plugins/network/pf_tables_ +++ b/plugins/pf/pf_tables_ @@ -91,7 +91,7 @@ if ( defined($ARGV[0])) { print "graph_args --base 1000 -l 0\n"; print "graph_vlabel Users\n"; print "graph_scale no\n"; - print "graph_category pf\n"; + print "graph_category network\n"; print "graph_printf %3.0lf\n"; print "users.label users\n"; @@ -108,7 +108,7 @@ if ( defined($ARGV[0])) { print "graph_args --base 1024 -l 0\n"; print "graph_vlabel Bandwidth\n"; print "graph_scale yes\n"; - print "graph_category pf\n"; + print "graph_category network\n"; # print "graph_printf %3.0lf\n"; print "in.label in\n"; diff --git a/plugins/other/sshd_log b/plugins/ssh/sshd_log similarity index 100% rename from plugins/other/sshd_log rename to plugins/ssh/sshd_log