[checkmk-commits] 4536 FIX akcp_sensor_humidity: Crash if parameters are set

Module: check_mk Branch: master Commit: ec6021bc812721d507dc1b4c3af650e88935d3f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec6021bc812721… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 14:26:18 2017 +0100 4536 FIX akcp_sensor_humidity: Crash if parameters are set Change-Id: I33913ecc53af93444a5df3323016c7e48052cdb3 --- .werks/4536 | 10 ++++++++++ checks/akcp_sensor.include | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/4536 b/.werks/4536 new file mode 100644 index 0000000..b81af55 --- /dev/null +++ b/.werks/4536 @@ -0,0 +1,10 @@ +Title: akcp_sensor_humidity: Crash if parameters are set +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489411528 +Class: fix + + diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index 7c5245d..427d00f 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -77,6 +77,13 @@ def inventory_akcp_humidity(info): yield description, "akcp_humidity_defaultlevels" def check_akcp_humidity(item, params, info): + if isinstance(params, tuple): + params = { + "levels_lower" : (params[1], params[0]), + "levels" : (params[3], params[2]), + } + + for description, percent, status, online in info: if description == item: # Online is set to "2" if sensor is offline @@ -87,7 +94,8 @@ def check_akcp_humidity(item, params, info): state, state_name = akcp_sensor_level_states[status] return state, "State: %s" % state_name - crit_lower, warn_lower, warn, crit = params + crit_lower, warn_lower = params['levels_lower'] + warn, crit = params['levels'] humidity = int(percent) infotext = "%s%%" % humidity