[checkmk-commits] Check_MK Git: check_mk: FIX: winperf_processor: handle parameters "None" ( as WATO creates)

Module: check_mk Branch: master Commit: f1fe4dcb401c9f41d680d416076262b833076b8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1fe4dcb401c9f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 17:28:47 2012 +0100 FIX: winperf_processor: handle parameters "None" (as WATO creates) --- ChangeLog | 1 + checks/winperf_processor | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 371a5f5..7817c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -230,6 +230,7 @@ Checks & Agents: * FIX: postgres_sessions: handle case of no active/no idle sessions + * FIX: winperf_processor: handle parameters "None" (as WATO creates) Multisite: * FIX: performeter_temparature now returns unicode string, because of °C diff --git a/checks/winperf_processor b/checks/winperf_processor index f9604af..d2e7d5b 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -57,7 +57,10 @@ def check_winperf_util(item, params, info): used_perc = 0 elif used_perc > 100: used_perc = 100 - warn, crit = params + if params != None: + warn, crit = params + else: + warn, crit = None, None perfdata = [ ("util", "%.2f" % used_perc, warn, crit, 0, 100) ] if num_cpus == 1: num_txt = "" @@ -66,9 +69,9 @@ def check_winperf_util(item, params, info): infotext = " - %d%% used%s (in last %d secs)" % (int(used_perc), num_txt, timedif) - if used_perc >= crit: + if crit != None and used_perc >= crit: return (2, "CRIT" + infotext, perfdata) - elif used_perc >= warn: + elif warn != None and used_perc >= warn: return (1, "WARN" + infotext, perfdata) else: return (0, "OK" + infotext, perfdata)