2
0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00

Merge pull request #172 from Flameeyes/master

One fix for my plugin and then remove deprecated graph_vtitle
This commit is contained in:
Kenyon Ralph 2012-08-23 11:01:23 -07:00
commit 12045d8019
6 changed files with 12 additions and 11 deletions

View File

@ -80,7 +80,7 @@ my %config = (
lookfor => 'Drive Temperature :',
label => 'Temp',
title => "MegaRAID Adapter $Adapter: Drive Temperatures",
vtitle => 'Celsius',
vlabel => 'Celsius',
graph_args => '--base 1000 -l 0',
warning => '55',
critical => '65',
@ -91,7 +91,7 @@ my %config = (
lookfor => 'Media Error Count: ',
label => 'Media Err',
title => "MegaRAID Adapter $Adapter: Media Errors (SMART)",
vtitle => 'Number of Errors',
vlabel => 'Number of Errors',
graph_args => '--base 1000 -l 0',
warning => '',
critical => '',
@ -102,7 +102,7 @@ my %config = (
lookfor => 'Other Error Count: ',
label => 'Other Err',
title => "MegaRAID Adapter $Adapter: Others Errors (SMART)",
vtitle => 'Number of Errors',
vlabel => 'Number of Errors',
graph_args => '--base 1000 -l 0',
warning => '',
critical => '',
@ -113,7 +113,7 @@ my %config = (
lookfor => 'Predictive Failure Count: ',
label => 'Predictive Err',
title => "MegaRAID Adapter $Adapter: Predictive Errors (SMART)",
vtitle => 'Number of Errors',
vlabel => 'Number of Errors',
graph_args => '--base 1000 -l 0',
warning => '',
critical => '',
@ -140,7 +140,7 @@ my @Output=qx($Command);
#Munin Config Options
if ($ARGV[0] and $ARGV[0] eq "config"){
print "graph_title $config{$Type}->{title}\n";
print "graph_vtitle $config{$Type}->{vtitle}\n";
print "graph_vlabel $config{$Type}->{vlabel}\n";
print "graph_args $config{$Type}->{graph_args}\n";
print "graph_scale yes\n";
print "graph_category disk\n";

View File

@ -157,7 +157,7 @@ File.open(CACHE_FILE, 'w') { |f| f.write log_info.to_yaml } unless $debug_mode
if ARGV.first == 'config'
puts <<CONFIG
graph_title Ejabberd Log
graph_vtitle total
graph_vlabel total
graph_category ejabberd
graph_args -l 0
graph_order #{(LABELS.keys + log_info.keys.select { |k| k.is_a? String }.sort).join(' ')}

View File

@ -64,7 +64,7 @@ when 'config'
puts <<CONFIG
graph_title Netstat: #{desc}
graph_category netstat
graph_vtitle current
graph_vlabel current
graph_order #{values.map { |name, _| name.to_s.escape }.join ' '}
CONFIG
puts values.map { |name, _|

View File

@ -58,7 +58,7 @@ class Graph
"multigraph #{name(unit)}",
"graph_title Netstat: #{@protocol}: #{@name}#{" (#{unit})" if multigraphs.size > 1}",
"graph_category netstat",
"graph_vtitle per second",
"graph_vlabel per second",
"graph_order #{labels.map(&:escape).join(' ')}"
]

View File

@ -13,7 +13,7 @@ case "$1" in
config)
cat << EOF
graph_title $TITLE
graph_vtitle Celsius
graph_vlabel Celsius
graph_args --base 1000 -l 0
graph_category sensors
temp.label $NAME

View File

@ -81,9 +81,10 @@ if ($ARGV[0] and $ARGV[0] eq "config") {
my $modelNo = $session->get_single($oidModelNo);
my $serialNo = $session->get_single($oidSerialNo);
print "graph_title PDU $modelNo ($serialNo)\n";
print "graph_vlabel Current drained (A)\n";
print "graph_title PDU Current Drain\n";
print "graph_vlabel Ampere\n";
print "graph_category Sensors\n";
print "graph_info This graph is for $modelNo PDU serial $serialNo\n"
for( my $phaseIndex = 1; $phaseIndex <= $numPhases; $phaseIndex++ ) {
my $nearOverloadThreshold = $session->get_single($oidNearOverloadThreshold . $phaseIndex);