[checkmk-commits] Check_MK Git: check_mk: FIX Cleaned up bad code in fileinfo.groups check

Module: check_mk Branch: master Commit: 3620534fa09f3466cf6e3426552b4b274c764f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3620534fa09f34… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Nov 12 13:17:34 2013 +0100 FIX Cleaned up bad code in fileinfo.groups check --- .werks/209 | 8 ++++++++ ChangeLog | 1 + checks/fileinfo | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/209 b/.werks/209 new file mode 100644 index 0000000..e79d4cc --- /dev/null +++ b/.werks/209 @@ -0,0 +1,8 @@ +Title: Cleaned up bad code in fileinfo.groups check +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384258634 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e883fd5..6344b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress + * 0209 FIX: Cleaned up bad code in fileinfo.groups check Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checks/fileinfo b/checks/fileinfo index 023ff92..df28a08 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -164,17 +164,17 @@ def check_fileinfo_groups(item, params, info): return fileinfo_check_function(check_definition, params) def fileinfo_check_function(check_definition, params): + import operator state = 0 infos = [] perfdata = [] for what, val, verbfunc in check_definition: infos.append("%s is %s" % (what, verbfunc(val))) warn, crit = "", "" - for how, comp in [ ("min", "<" ), ("max", ">") ]: + for how, comp, cfunc in [ ("min", "<", operator.lt), ("max", ">", operator.gt) ]: p = params.get(how + what) if p: warn, crit = p - cfunc = eval("lambda a,b: a %s b" % comp) if cfunc(val, crit): state = 2 infos[-1] += " (%s %s)(!!)" % (comp, verbfunc(crit))