[checkmk-commits] Check_MK Git: check_mk: dell_powerconnect_cpu: hopefully correctly handle incomplete agent output

Module: check_mk Branch: master Commit: 3e4fb57a3c7cdf020d4073b9bd6097746fc05873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e4fb57a3c7cdf… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Tue Feb 21 22:07:42 2012 +0100 dell_powerconnect_cpu: hopefully correctly handle incomplete agent output --- ChangeLog | 2 ++ checks/dell_powerconnect_cpu | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ee5b34..12b96e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,8 @@ (this prevents an exception of pfSense) * statgrab_load: level is now checked against 15min average - in order to be consistent with the Linux load check + * dell_powerconnect_cpu: hopefully correctly handle incomplete + output from agent now. Multisite: * Added several missing localization strings diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index 124c138..aaf2150 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -43,7 +43,7 @@ dell_powerconnect_cpu_default_levels = (80, 90) # Inventory of dell power connect CPU details. def inventory_dell_powerconnect_cpu(checkname, info): enabled, onesecondperc, oneminuteperc, fiveminutesperc = info[0] - if int(enabled) == 1 and int(onesecondperc) >= 0 <= 100: + if enabled == '1' and onesecondperc != '' and int(onesecondperc) >= 0: return [ (None, 'dell_powerconnect_cpu_default_levels') ] # Check of dell power connect CPU details. @@ -53,7 +53,7 @@ def check_dell_powerconnect_cpu(item, params, info): except ValueError: raise MKCounterWrapped("", "Ignoring empty data from SNMP agent") if int(enabled) == 1: - cpu_load = int(onesecondperc) + cpu_load = saveint(onesecondperc) if cpu_load >= 0 <= 100: status = 0 output = '' @@ -67,8 +67,8 @@ def check_dell_powerconnect_cpu(item, params, info): return (status, '%s - CPU utilization is %d%% %s' % (nagios_state_names[status], cpu_load, output), [('load', '%d%%' % cpu_load, params[0], params[1], 0, 100), - ('loadavg 60s', '%d%%' % int(oneminuteperc), params[0], params[1], 0, 100), - ('loadavg 5m', '%d%%' % int(fiveminutesperc), params[0], params[1], 0, 100), + ('loadavg 60s', '%d%%' % saveint(oneminuteperc), params[0], params[1], 0, 100), + ('loadavg 5m', '%d%%' % saveint(fiveminutesperc), params[0], params[1], 0, 100), ]) return (3, "UNKNOWN - Invalid information in SNMP data")