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

Bug fix: Check temp_upper_warning and temp_upper_critical was not working again.

This commit is contained in:
Jun Futagawa 2011-02-07 04:53:21 +01:00 committed by Steve Schnepp
parent 05215bc2dc
commit e7454e6304

View File

@ -60,6 +60,9 @@
# Narrow the voltage bracket by this. (default: 20)
#
# $Log$
# Revision 1.6 2011/02/07 12:50:00 jfut
# Bug fix: Check temp_upper_warning and temp_upper_critical was not working again.
#
# Revision 1.5 2011/01/28 00:39:00 jfut
# Bug fix: Check temp_upper_warning and temp_upper_critical was not working.
#
@ -306,22 +309,22 @@ sub temp_threshold {
else { $lcr = 5; }
}
# lnc: lower warning
if (exists $ENV{temp_lower_warningl}) {
if (exists $ENV{temp_lower_warning}) {
$lnc = $ENV{temp_lower_warning};
} elsif (! &is_valid_value($lnc)) {
if ($lnc eq 'inf') { $lnc = ''; }
else { $lnc = 10; }
}
# unc: upper critical
if (exists $ENV{temp_upper_critical}) {
$unc = $ENV{temp_upper_critical};
# unc: upper warning
if (exists $ENV{temp_upper_warning}) {
$unc = $ENV{temp_upper_warning};
} elsif (! &is_valid_value($unc)) {
if ($unc eq 'inf') { $unc = ''; }
else { $unc = '65'; }
}
# ucr: upper warning
if (exists $ENV{temp_upper_warning}) {
$ucr = $ENV{temp_upper_warning};
# ucr: upper critical
if (exists $ENV{temp_upper_critical}) {
$ucr = $ENV{temp_upper_critical};
} elsif (! &is_valid_value($ucr)) {
if ($ucr eq 'inf') { $ucr = ''; }
else { $ucr = '70'; }
@ -375,9 +378,22 @@ sub is_valid_value() {
cache_file=ipmitool_sensor_ cache_expires=-1 ./ipmitool_sensor_volt config
cache_file=ipmitool_sensor_ cache_expires=-1 ./ipmitool_sensor_volt suggest
cache_file=ipmitool_sensor_ cache_expires=-1 ./ipmitool_sensor_volt autoconf
fan_warn_percent=50 fan_lower_critical=100 fan_upper_critical=1000 cache_file=ipmitool_sensor_ \
cache_expires=-1 ./ipmitool_sensor_fan config
temp_lower_warning=1 temp_lower_critical=2 temp_upper_critical=71 temp_upper_warning=72 \
cache_file=ipmitool_sensor_ cache_expires=-1 ./ipmitool_sensor_temp config
volt_warn_percent=50 \
cache_file=ipmitool_sensor_ cache_expires=-1 ./ipmitool_sensor_volt config
=head1 Test Data
unr Upper Non-Recoverable
ucr Upper Critical
unc Upper Non-Critical
lnc Lower Non-Critical
lcr Lower Critical
lnr Lower Non-Recoverable
=head2 ipmitool sensor
# HP ProLiant ML110 G5