[checkmk-commits] additional update for #WK5251

Module: check_mk Branch: master Commit: b5c9b3a18b7469ae0f612c92d79ff1cb8e599748 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5c9b3a18b7469… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 12 14:35:30 2017 +0100 additional update for #WK5251 Change-Id: I3583f4d5aae2c15ef877f081f19f0c7c15baf45d --- checks/check_mk | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/checks/check_mk b/checks/check_mk index 15479b6..9cc63c5 100644 --- a/checks/check_mk +++ b/checks/check_mk @@ -148,33 +148,32 @@ def check_cmk_agent_update(_no_item, _no_params, info): if parsed["error"] != "None": yield 1, "error: %s" % parsed["error"] - if len(parsed.keys()) == 1: - return else: yield 0, "no errors" - try: - last_check = float(parsed["last_check"]) - age = now - last_check - # Currently there is no crit level - warn = 2 * 3600 * 24 - if age > warn: - state = 1 - else: - state = 0 - if state: - levels_text = " (warn at %s)" % (get_age_human_readable(warn)) - else: - levels_text = "" - yield state, "last update check: " + get_timestamp_human_readable(parsed["last_check"]) + levels_text - except: - yield 1, "no successful connect to server yet" - - if parsed.get("last_update"): + if parsed["last_check"]: + try: + last_check = float(parsed["last_check"]) + age = now - last_check + # Currently there is no crit level + warn = 2 * 3600 * 24 + if age > warn: + state = 1 + else: + state = 0 + if state: + levels_text = " (warn at %s)" % (get_age_human_readable(warn)) + else: + levels_text = "" + yield state, "last update check: " + get_timestamp_human_readable(parsed["last_check"]) + levels_text + except: + yield 1, "no successful connect to server yet" + + if parsed["last_update"]: yield 0, "last agent update: %s" % get_timestamp_human_readable(parsed["last_update"]) - if parsed.get("aghash"): + if parsed["aghash"]: yield 0, "agent configuration: %s" % parsed["aghash"][:8] return