[checkmk-commits] Added sensor names to service details

Module: check_mk Branch: master Commit: 9b7e6f923242f485da11f5583f720ab20e1824b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b7e6f923242f4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 18 11:51:00 2017 +0200 Added sensor names to service details Change-Id: I44d8ddbd24c252511ca27f10df86f1a91d2ec05c --- checks/etherbox | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/etherbox b/checks/etherbox index ffdbaa7..61591e0 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -135,7 +135,8 @@ def check_etherbox_humidity(item, params, info): except Exception, error: return 3, error.message - return check_humidity(int(value) / 10.0, params) + state, infotext, perfdata = check_humidity(int(value) / 10.0, params) + return state, "[%s] %s" % (name, infotext), perfdata check_info["etherbox.humidity"] = { @@ -211,13 +212,11 @@ def check_etherbox_smoke(item, no_params, info): state = 0 perfdata = [ ("smoke", value) ] - extra_info = "" + infotext = "Status: OK" if value != "0": - extra_info = " - Smoke alarm!" + infotext = "Status: smoke alarm" state = 2 - - return (state, "[%s] Smoke sensor%s" % (name, extra_info), perfdata) - + return state, "[%s] %s" % (name, infotext), perfdata check_info["etherbox.smoke"] = { "check_function" : check_etherbox_smoke,