[checkmk-commits] Check_MK Git: check_mk: FIX megaraid_bbu: Fixed expected state checking

Module: check_mk Branch: master Commit: dfa4ee396bea7023eac8a2c811f2ae7bcdd2dc48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfa4ee396bea70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 13:57:53 2013 +0100 FIX megaraid_bbu: Fixed expected state checking The check was unable to check the hard coded expected states. This made the check never raise expected alerts. --- .werks/357 | 11 +++++++++++ ChangeLog | 1 + checks/megaraid_bbu | 16 ++++++++-------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.werks/357 b/.werks/357 new file mode 100644 index 0000000..f13596b --- /dev/null +++ b/.werks/357 @@ -0,0 +1,11 @@ +Title: megaraid_bbu: Fixed expected state checking +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387198439 +Targetversion: future + +The check was unable to check the hard coded expected states. This +made the check never raise expected alerts. diff --git a/ChangeLog b/ChangeLog index e37fa14..09ec106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0059 FIX: agent_vpshere: new option for supporting ESX 4.1... * 0334 FIX: cisco_fantray: Fixed error on Cisco devices which do not support this check... * 0355 FIX: heartbeat_crm: Now handling "Failed actions:" output in agent... + * 0357 FIX: megaraid_bbu: Fixed expected state checking... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu index 54cf2cf..b7e097e 100644 --- a/checks/megaraid_bbu +++ b/checks/megaraid_bbu @@ -90,10 +90,15 @@ def check_megaraid_bbu(item, _no_params, info): # if your bbu chipset fails and you still get a partial response this will lead # to a false result. but people asked for it :> try: - if controller[varname] != refvalue: - broken.append("%s is %s, but should be %s(%s)" % (varname, value, refvalue, "!" * refstate)) + value = controller[varname] + if value != refvalue: + text = '%s is %s' % (varname, value) + if refstate: + text += ' (%s)' % ("!" * refstate) + text += ' (Expected: %s)' % refvalue + broken.append(text) state = max(state, refstate) - except: + except KeyError: pass if controller.get("Learn Cycle Active") == "Yes": @@ -104,11 +109,6 @@ def check_megaraid_bbu(item, _no_params, info): else: return (0, "all states as expected" + charge) - return (3, "Check not implemented") - - - - check_info["megaraid_bbu"] = { 'check_function': check_megaraid_bbu, 'inventory_function': inventory_megaraid_bbu,