[checkmk-commits] 4147 FIX Always show rule analyser result on Generate, not only after previous Try out

Module: check_mk Branch: master Commit: 90c75443e8208e347c4a860ae63136ca006716b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90c75443e8208e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 13:41:40 2016 +0100 4147 FIX Always show rule analyser result on Generate, not only after previous Try out In the Event Console configuration there is the event simulator. If you first did {{Try out}} with a message and after that {{Generate}}, then still the event would be analysed and the rules marked according to the matches. Previously this did not work when you did not {{Try out}} before. This has been fixed. --- .werks/4147 | 15 +++++++++++++++ ChangeLog | 1 + web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4147 b/.werks/4147 new file mode 100644 index 0000000..ab5edeb --- /dev/null +++ b/.werks/4147 @@ -0,0 +1,15 @@ +Title: Always show rule analyser result on Generate, not only after previous Try out +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1481114369 + +In the Event Console configuration there is the event simulator. If you first did +{{Try out}} with a message and after that {{Generate}}, then still the event +would be analysed and the rules marked according to the matches. + +Previously this did not work when you did not {{Try out}} before. This has been +fixed. diff --git a/ChangeLog b/ChangeLog index 8f74116..09e9bb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ Event Console: * 4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context... * 4097 FIX: Event console: Make writing of status file more robust... + * 4147 FIX: Always show rule analyser result on Generate, not only after previous Try out... Livestatus: * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f0fe8b6..04757db 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1184,7 +1184,7 @@ def show_event_simulator(): html.end_form() html.br() - if html.var("simulate"): + if html.var("simulate") or html.var("_generate"): return vs_mkeventd_event.from_html_vars("event") else: return None