[checkmk-commits] 6014 FIX Fixed handling of expected regular messages

Module: check_mk Branch: master Commit: a2eb5c1ec298cbeee0e53789fb4482240eb60e14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2eb5c1ec298cb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 2 15:35:51 2018 +0200 6014 FIX Fixed handling of expected regular messages If expected regular messages did not arrive at the event console and the resulting new event was not merged with a previous one, the EC could go into an endless loop, logging Python exceptions all the time. This has been fixed. Change-Id: I2a307671f6476ef7e099d4cd3a8b90450a7e597a --- .werks/6014 | 13 +++++++++++++ cmk/ec/main.py | 2 ++ 2 files changed, 15 insertions(+) diff --git a/.werks/6014 b/.werks/6014 new file mode 100644 index 0000000..7a56f46 --- /dev/null +++ b/.werks/6014 @@ -0,0 +1,13 @@ +Title: Fixed handling of expected regular messages +Level: 2 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530538326 +Class: fix + +If expected regular messages did not arrive at the event console and the +resulting new event was not merged with a previous one, the EC could go into +an endless loop, logging Python exceptions all the time. This has been +fixed. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index fcf02ea..583f63c 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1293,6 +1293,8 @@ class EventServer(ECServerThread): "facility": 1, # user "match_groups": (), "match_groups_syslog_application": (), + "core_host": "", + "host_in_downtime": False, } self._add_rule_contact_groups_to_event(rule, event) self.rewrite_event(rule, event, {})