From 444c7939deaf2a6ded5eb86812e270ce301d5906 Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 01:51:44 +0100 Subject: [PATCH] Category Tree: Reduce number of categories tomcat -> webserver (tomcat) radiator -> auth (radiator) ups -> sensors (ups) --- plugins/mod_jk/mod_jk | 6 +++--- plugins/nagios/nagiosstatus | 2 +- plugins/radiator/radiator_acct_lag | 2 +- plugins/radiator/radiator_acct_ppm | 2 +- plugins/radiator/radiator_auth_lag | 2 +- plugins/radiator/radiator_auth_ppm | 2 +- plugins/tomcat/tomcat_access | 2 +- plugins/ups/apcupsd_pct | 2 +- plugins/ups/apcupsd_ww | 2 +- plugins/{snmp => ups}/snmp__apc_ups | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename plugins/{snmp => ups}/snmp__apc_ups (99%) diff --git a/plugins/mod_jk/mod_jk b/plugins/mod_jk/mod_jk index 7c607d36..f4358c0a 100755 --- a/plugins/mod_jk/mod_jk +++ b/plugins/mod_jk/mod_jk @@ -26,7 +26,7 @@ then # Status graph echo "multigraph mod_jk_status" echo "graph_title mod_jk Status" - echo "graph_category tomcat" + echo "graph_category webserver" echo "graph_info This graph shows the status of the different mod_jk nodes." echo "graph_vlabel Status" @@ -43,7 +43,7 @@ then do echo "multigraph mod_jk_requests_$i" echo "graph_title mod_jk Requests $i" - echo "graph_category tomcat" + echo "graph_category webserver" echo "graph_info This graph shows the status of requests to the mod_jk node: $i" echo "graph_vlabel Request" echo "busy.label Current" @@ -59,7 +59,7 @@ then do echo "multigraph mod_jk_traffic_$i" echo "graph_title mod_jk Traffic $i" - echo "graph_category tomcat" + echo "graph_category webserver" echo "graph_info This graph shows the traffic statistics to the mod_jk node: $i" echo "graph_vlabel Bytes/min" echo "transferred.label Write to node (bytes/min)" diff --git a/plugins/nagios/nagiosstatus b/plugins/nagios/nagiosstatus index 55eced93..57200814 100755 --- a/plugins/nagios/nagiosstatus +++ b/plugins/nagios/nagiosstatus @@ -54,7 +54,7 @@ if ($ARGV[0]) { } elsif ($ARGV[0] eq "config") { print "graph_args --base 1000 -l 0 --vertical-label Checks\n"; print "graph_title Nagios status\n"; - print "graph_category Nagios\n"; + print "graph_category munin\n"; print "graph_info This graph shows how many Nagios checks are in warning or critical state.\n"; print "graph_order hdown hunknown swarning scritical sunknown\n"; print "hdown.label Hosts down\n"; diff --git a/plugins/radiator/radiator_acct_lag b/plugins/radiator/radiator_acct_lag index 7c0010f2..be9ab4e8 100755 --- a/plugins/radiator/radiator_acct_lag +++ b/plugins/radiator/radiator_acct_lag @@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Radiator ACCT response lag' echo 'graph_vlabel time' echo 'graph_args -l 0' - echo 'graph_category radiator' + echo 'graph_category auth' echo 'graph_info This graph displayes ACCT response lag of all radiator processes combined.' # # Count all statistics files and create labels diff --git a/plugins/radiator/radiator_acct_ppm b/plugins/radiator/radiator_acct_ppm index 22c2a139..04ef8687 100755 --- a/plugins/radiator/radiator_acct_ppm +++ b/plugins/radiator/radiator_acct_ppm @@ -36,7 +36,7 @@ if [ "$1" = "config" ]; then echo 'graph_period minute' echo 'graph_vlabel packets per minute' echo 'graph_args -l 0' - echo 'graph_category radiator' + echo 'graph_category auth' echo 'graph_info This graph displays ACCT packets of all radiator processes combined.' # # Count all statistics files and create labels diff --git a/plugins/radiator/radiator_auth_lag b/plugins/radiator/radiator_auth_lag index 0a59042e..9b33b0d1 100755 --- a/plugins/radiator/radiator_auth_lag +++ b/plugins/radiator/radiator_auth_lag @@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Radiator AUTH response lag' echo 'graph_vlabel time' echo 'graph_args -l 0' - echo 'graph_category radiator' + echo 'graph_category auth' echo 'graph_info This graph displayes AUTH response lag of all radiator processes combined.' # # Count all statistics files and create labels diff --git a/plugins/radiator/radiator_auth_ppm b/plugins/radiator/radiator_auth_ppm index 70111bd2..0e4c5d14 100755 --- a/plugins/radiator/radiator_auth_ppm +++ b/plugins/radiator/radiator_auth_ppm @@ -36,7 +36,7 @@ if [ "$1" = "config" ]; then echo 'graph_period minute' echo 'graph_vlabel packets per minute' echo 'graph_args -l 0' - echo 'graph_category radiator' + echo 'graph_category auth' echo 'graph_info This graph displayes AUTH packets of all radiator processes combined.' # # Count all statistics files and create labels diff --git a/plugins/tomcat/tomcat_access b/plugins/tomcat/tomcat_access index bdf401d4..f77324b9 100755 --- a/plugins/tomcat/tomcat_access +++ b/plugins/tomcat/tomcat_access @@ -94,7 +94,7 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") { print "graph_title Tomcat accesses\n"; print "graph_args --base 1000\n"; print "graph_vlabel accesses / \${graph_period}\n"; - print "graph_category tomcat\n"; + print "graph_category webserver\n"; print "accesses.label Accesses\n"; print "accesses.type DERIVE\n"; print "accesses.max 1000000\n"; diff --git a/plugins/ups/apcupsd_pct b/plugins/ups/apcupsd_pct index 65e34ea5..dec45cfb 100755 --- a/plugins/ups/apcupsd_pct +++ b/plugins/ups/apcupsd_pct @@ -64,7 +64,7 @@ sub decide_monitor_type { # common %Graph = ( graph_title => "APC Status".($UPS_MODEL?" ($UPS_MODEL)":"")." - ", - graph_category => "ups", + graph_category => "sensors", graph_info => "This graph shows information about your APC UPS", graph_args => "--base 1000 --lower-limit 0", ); diff --git a/plugins/ups/apcupsd_ww b/plugins/ups/apcupsd_ww index b0b86f7c..b50067b3 100755 --- a/plugins/ups/apcupsd_ww +++ b/plugins/ups/apcupsd_ww @@ -204,7 +204,7 @@ if (defined $ARGV[0] && $ARGV[0] eq 'config') { print "graph_title $data{MODEL}\n"; } #print "graph_vlabel Units\n"; - print "graph_category ups\n"; + print "graph_category sensors\n"; print "graph_info This graph shows information about your APC uninterruptible power supply.\n"; foreach my $what (sort keys %attrs) { diff --git a/plugins/snmp/snmp__apc_ups b/plugins/ups/snmp__apc_ups similarity index 99% rename from plugins/snmp/snmp__apc_ups rename to plugins/ups/snmp__apc_ups index bbcc77c6..73489c8f 100755 --- a/plugins/snmp/snmp__apc_ups +++ b/plugins/ups/snmp__apc_ups @@ -463,7 +463,7 @@ sub emit_config { say "graph_title ".( $title{$graph} || "Untitled /$graph/"); say process_oids( "graph_vlabel " . $vlabel{$graph}, $values ); - say "graph_category UPS"; + say "graph_category sensors"; say process_oids( "graph_info " . $info{$graph}, $values ); foreach my $label (keys %{ $label{$graph} } ) {