[checkmk-commits] Check_MK Git: check_mk: FIX: EC: make hostname matching field optional.

Module: check_mk Branch: master Commit: beae4280174be1717cc9aac6dc88c886cd2309a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beae4280174be1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 15 11:41:41 2013 +0100 FIX: EC: make hostname matching field optional. Conflicts: ChangeLog --- ChangeLog | 3 +++ mkeventd/web/plugins/wato/mkeventd.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbcab31..4eb3415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,9 @@ * FIX: speedup for single host tables joined by hostname (BI-Boxes) * FIX: avoid closing BI subtree while tree is being loaded + Event Console: + * FIX: make hostname matching field optional. Otherwise a .* was + neccessary for the rule in order to match 1.2.2b4: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 2776738..cd7fb7c 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -610,7 +610,8 @@ vs_mkeventd_rule = Dictionary( ), ], optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", - "match_facility", "match_sl", "set_text", "set_host", "set_application", "set_comment", + "match_facility", "match_sl", "match_host", "match_application", + "set_text", "set_host", "set_application", "set_comment", "set_contact", "cancel_priority", "match_ok" ], headers = [ ( _("General Properties"), [ "id", "description", "disabled" ] ),