[checkmk-commits] Check_MK Git: check_mk: Make some memory checks tolerate new dict params

Module: check_mk Branch: master Commit: 75e269f6b4edb47bef5e7366fa63b0462044079c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75e269f6b4edb4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 12:55:25 2014 +0100 Make some memory checks tolerate new dict params --- checks/cisco_sys_mem | 5 +++++ checks/fortigate_memory | 5 +++++ checks/hr_mem | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/checks/cisco_sys_mem b/checks/cisco_sys_mem index a56af93..f3791b9 100644 --- a/checks/cisco_sys_mem +++ b/checks/cisco_sys_mem @@ -36,6 +36,11 @@ def inventory_cisco_sys_mem(info): return [] def check_cisco_sys_mem(_no_item, params, info): + # This check does not yet support averaging. We need to + # convert it to mem.include + if type(params) == dict: + params = params["levels"] + warn, crit = params if info[0][0]: mem_used = float(info[0][0]) diff --git a/checks/fortigate_memory b/checks/fortigate_memory index 4549924..fe2617a 100644 --- a/checks/fortigate_memory +++ b/checks/fortigate_memory @@ -27,6 +27,11 @@ fortigate_memory_default_levels = (70, 80) def check_fortigate_memory(item, params, info): + # This check does not yet support averaging. We need to + # convert it to mem.include + if type(params) == dict: + params = params["levels"] + warn, crit = params current = saveint(info[0][0]) state = 0 diff --git a/checks/hr_mem b/checks/hr_mem index 50440c0..4f8679b 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -38,6 +38,11 @@ def inventory_hr_mem(info): return [(None, "memused_default_levels")] def check_hr_mem(_no_item, params, info): + # This check does not yet support averaging. We need to + # convert it to mem.include + if type(params) == dict: + params = params["levels"] + usage = {} for hrtype, hrdescr, hrunits, hrsize, hrused in info: if hrtype in [ ".1.3.6.1.2.1.25.2.1.2",