[checkmk-commits] 6222 FIX Fix exception during event rewriting, causing events for missing expected messages failing to be created

Module: check_mk Branch: master Commit: 889e4a4eea56e9b00f42ad8838367cfa753bd672 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=889e4a4eea56e9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 22 16:02:21 2018 +0200 6222 FIX Fix exception during event rewriting, causing events for missing expected messages failing to be created This issue had been introduced with Werk #5254 Change-Id: I488b51f231596aa412ddec0a740a1f0a3adbf0dc --- .werks/6222 | 11 +++++++++++ cmk/ec/main.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6222 b/.werks/6222 new file mode 100644 index 0000000..1ecc02d --- /dev/null +++ b/.werks/6222 @@ -0,0 +1,11 @@ +Title: Fix exception during event rewriting, causing events for missing expected messages failing to be created +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1529675772 + +This issue had been introduced with Werk #5254 diff --git a/cmk/ec/main.py b/cmk/ec/main.py index f6fd0e4..fcf02ea 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1271,7 +1271,7 @@ class EventServer(ECServerThread): merge_event["text"] = text # Better rewrite (again). Rule might have changed. Also we have changed # the text and the user might have his own text added via set_text. - self.rewrite_event(rule, merge_event, ()) + self.rewrite_event(rule, merge_event, {}) self._history.add(merge_event, "COUNTFAILED") else: # Create artifical event from scratch. Make sure that all important @@ -1295,7 +1295,7 @@ class EventServer(ECServerThread): "match_groups_syslog_application": (), } self._add_rule_contact_groups_to_event(rule, event) - self.rewrite_event(rule, event, ()) + self.rewrite_event(rule, event, {}) self._event_status.new_event(event) self._history.add(event, "COUNTFAILED") cmk.ec.actions.event_has_opened(self._history, self.settings, self._config, self._logger, self, self._event_columns, rule, event)