From ae4e85ab60d6572e32f284ddbdcaa8b965af9770 Mon Sep 17 00:00:00 2001 From: dipohl Date: Fri, 24 Feb 2017 03:13:08 +0100 Subject: [PATCH] Plugin-Gallery: Better 2nd level headings --- plugins/{snmp => juniper}/snmp__juniper | 0 plugins/{snmp => juniper}/snmp__juniper_spu | 0 plugins/other/uustat | 4 +--- plugins/{forums => punbb}/punbb_users | 0 plugins/puppet/puppet_runtime | 12 ++++++------ plugins/{forums => vbulletin}/vbulletin4_users | 2 +- plugins/{forums => vbulletin}/vbulletin_users | 2 +- plugins/{network => vpn}/dar_vpnd | 4 ++-- plugins/{openvpn => vpn}/openvpn_as_mtime | 0 plugins/{openvpn => vpn}/openvpn_as_traffic | 0 plugins/{openvpn => vpn}/openvpn_as_ttime | 0 plugins/{openvpn => vpn}/openvpn_as_users | 0 plugins/{openvpn => vpn}/openvpn_multi | 0 13 files changed, 11 insertions(+), 13 deletions(-) rename plugins/{snmp => juniper}/snmp__juniper (100%) rename plugins/{snmp => juniper}/snmp__juniper_spu (100%) rename plugins/{forums => punbb}/punbb_users (100%) rename plugins/{forums => vbulletin}/vbulletin4_users (98%) rename plugins/{forums => vbulletin}/vbulletin_users (98%) rename plugins/{network => vpn}/dar_vpnd (96%) rename plugins/{openvpn => vpn}/openvpn_as_mtime (100%) rename plugins/{openvpn => vpn}/openvpn_as_traffic (100%) rename plugins/{openvpn => vpn}/openvpn_as_ttime (100%) rename plugins/{openvpn => vpn}/openvpn_as_users (100%) rename plugins/{openvpn => vpn}/openvpn_multi (100%) diff --git a/plugins/snmp/snmp__juniper b/plugins/juniper/snmp__juniper similarity index 100% rename from plugins/snmp/snmp__juniper rename to plugins/juniper/snmp__juniper diff --git a/plugins/snmp/snmp__juniper_spu b/plugins/juniper/snmp__juniper_spu similarity index 100% rename from plugins/snmp/snmp__juniper_spu rename to plugins/juniper/snmp__juniper_spu diff --git a/plugins/other/uustat b/plugins/other/uustat index 8002d7e3..46c54079 100755 --- a/plugins/other/uustat +++ b/plugins/other/uustat @@ -12,7 +12,6 @@ # # Environment # exclude: space separated list hosts to exclude. -# category: category of this plugin, default 'postfix' # host.warning: Warning packages threshold, default none. # host.critical: Critical packages threshold, default none. # @@ -88,13 +87,12 @@ if (@ARGV > 0 && $ARGV[0] eq 'autoconf') { } if (@ARGV > 0 && $ARGV[0] eq 'config') { - my $category = $ENV{'category'} || 'postfix'; print "graph_title UUCP usage \n"; print "graph_args -l 0\n"; print "graph_vlabel packages\n"; print "graph_scale no\n"; - printf "graph_category %s\n", $category; + print "graph_category postfix\n"; foreach my $host (hosts) { next if host_excluded $host; diff --git a/plugins/forums/punbb_users b/plugins/punbb/punbb_users similarity index 100% rename from plugins/forums/punbb_users rename to plugins/punbb/punbb_users diff --git a/plugins/puppet/puppet_runtime b/plugins/puppet/puppet_runtime index c4eea5ca..8962f4df 100755 --- a/plugins/puppet/puppet_runtime +++ b/plugins/puppet/puppet_runtime @@ -29,12 +29,12 @@ end case ARGV[0] when 'config' - puts "graph_category puppet" - puts "graph_args --base 1000 -l 0" - puts "graph_scale no" - puts "graph_title puppet catalog run time" - puts "graph_vlabel Seconds" - puts "runtime.label Catalog application time" + puts "graph_category devel" + puts "graph_args --base 1000 -l 0" + puts "graph_scale no" + puts "graph_title puppet catalog run time" + puts "graph_vlabel Seconds" + puts "runtime.label Catalog application time" exit 0 when 'autoconf' puts "yes" diff --git a/plugins/forums/vbulletin4_users b/plugins/vbulletin/vbulletin4_users similarity index 98% rename from plugins/forums/vbulletin4_users rename to plugins/vbulletin/vbulletin4_users index 5f6ee7e5..ead4ebb8 100644 --- a/plugins/forums/vbulletin4_users +++ b/plugins/vbulletin/vbulletin4_users @@ -60,7 +60,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) print "graph_title Forum Users\n"; print "graph_args -l 0\n"; print "graph_vlabel current users\n"; - print "graph_category Forum\n"; + print "graph_category forum\n"; print "graph_total Total\n"; print "members.label Members\n"; diff --git a/plugins/forums/vbulletin_users b/plugins/vbulletin/vbulletin_users similarity index 98% rename from plugins/forums/vbulletin_users rename to plugins/vbulletin/vbulletin_users index 9fb43980..663eb3d0 100755 --- a/plugins/forums/vbulletin_users +++ b/plugins/vbulletin/vbulletin_users @@ -60,7 +60,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) print "graph_title Forum Users\n"; print "graph_args -l 0\n"; print "graph_vlabel current users\n"; - print "graph_category Forum\n"; + print "graph_category forum\n"; print "graph_total Total\n"; print "members.label Members\n"; diff --git a/plugins/network/dar_vpnd b/plugins/vpn/dar_vpnd similarity index 96% rename from plugins/network/dar_vpnd rename to plugins/vpn/dar_vpnd index 660d82e5..f454429b 100755 --- a/plugins/network/dar_vpnd +++ b/plugins/vpn/dar_vpnd @@ -31,7 +31,7 @@ use strict; my $cmd = "ps -ef | awk '/[p]ppd/ {print substr(\$NF,2);}' | wc -l"; if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { - print "graph_category VPN\n"; + print "graph_category network\n"; print "graph_args --base 1024 -r --lower-limit 0\n"; print "graph_title Number of VPN Connections\n"; print "graph_vlabel VPN Connections\n"; @@ -41,4 +41,4 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { } else { my $output = `$cmd`; print "connections.value $output"; -} \ No newline at end of file +} diff --git a/plugins/openvpn/openvpn_as_mtime b/plugins/vpn/openvpn_as_mtime similarity index 100% rename from plugins/openvpn/openvpn_as_mtime rename to plugins/vpn/openvpn_as_mtime diff --git a/plugins/openvpn/openvpn_as_traffic b/plugins/vpn/openvpn_as_traffic similarity index 100% rename from plugins/openvpn/openvpn_as_traffic rename to plugins/vpn/openvpn_as_traffic diff --git a/plugins/openvpn/openvpn_as_ttime b/plugins/vpn/openvpn_as_ttime similarity index 100% rename from plugins/openvpn/openvpn_as_ttime rename to plugins/vpn/openvpn_as_ttime diff --git a/plugins/openvpn/openvpn_as_users b/plugins/vpn/openvpn_as_users similarity index 100% rename from plugins/openvpn/openvpn_as_users rename to plugins/vpn/openvpn_as_users diff --git a/plugins/openvpn/openvpn_multi b/plugins/vpn/openvpn_multi similarity index 100% rename from plugins/openvpn/openvpn_multi rename to plugins/vpn/openvpn_multi