Module: check_mk Branch: master Commit: 900a2356649316814c4b9616485c98372c692922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=900a2356649316… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 29 14:58:51 2015 +0200 #2366 FIX carel_sensors: fix crash in case of missing temperature sensor --- .werks/2366 | 10 ++++++++++ ChangeLog | 1 + checks/carel_sensors | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2366 b/.werks/2366 new file mode 100644 index 0000000..7b12021 --- /dev/null +++ b/.werks/2366 @@ -0,0 +1,10 @@ +Title: carel_sensors: fix crash in case of missing temperature sensor +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435582715 + + diff --git a/ChangeLog b/ChangeLog index b9ac12f..2d319c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 2362 FIX: mk_logwatch: fix cases where one logfile is listsed more than once in logwatch.cfg... * 2363 FIX: jolokia_metrics.uptime: Do not inventory instances where Uptime is missing - avoid crashed check * 2381 FIX: emc_datadomain_fans: Made check more robust against broken SNMP output + * 2366 FIX: carel_sensors: fix crash in case of missing temperature sensor Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/checks/carel_sensors b/checks/carel_sensors index 0dbf10e..252cbb7 100644 --- a/checks/carel_sensors +++ b/checks/carel_sensors @@ -87,7 +87,9 @@ def inventory_carel_sensors_temp(parsed): def check_carel_sensors_temp(item, params, parsed): - return check_temperature(parsed["temp"][item], params) + if item in parsed["temp"]: + return check_temperature(parsed["temp"][item], params) + check_info["carel_sensors"] = { "parse_function" : carel_sensors_parse,