[checkmk-commits] Check_MK Git: check_mk: EC: FIX: fix bug in Filter "Hostname/

IP-Address of original event" Message-ID: <50d07bad.5lq07lJxXXyW7n0P%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1ad9ccee0f7b79956e12dc15990231d8c9fc471d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ad9ccee0f7b79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 18 15:20:25 2012 +0100 EC: FIX: fix bug in Filter "Hostname/IP-Address of original event" --- ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c79d77..cd1e07d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * FIX: fix exception in rules that use facility local7 * FIX: fix event icon in case of using TCP access to EC * FIX: Allowing ":" in application field (e.g. needed for windows logfiles) + * FIX: fix bug in Filter "Hostname/IP-Address of original event" * Replication slave can now copy rules from master into local configuration via a new button in WATO. * Speedup access to event history by earlier filtering and prefiltering with grep diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 8dc44ee..7f36c7e 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -201,8 +201,8 @@ if mkeventd_enabled: # returns header lines for the event daemon, if the filter is in # use. class EventFilterText(FilterText): - def __init__(self, table, name, title, op): - FilterText.__init__(self, name, title, table, name, name, op) + def __init__(self, table, filter_name, column, title, op): + FilterText.__init__(self, filter_name, title, table, column, filter_name, op) self._table = table # Disable Livestatus filter @@ -212,17 +212,17 @@ if mkeventd_enabled: def event_headers(self): return FilterText.filter(self, self._table) - declare_filter(200, EventFilterText("event", "event_id", _("Event ID"), "=")) - declare_filter(200, EventFilterText("event", "event_rule_id", _("ID of rule"), "=")) - declare_filter(201, EventFilterText("event", "event_text", _("Message/Text of event"), "~~")) - declare_filter(201, EventFilterText("event", "event_application", _("Application / Syslog-Tag"), "~~")) - declare_filter(201, EventFilterText("event", "event_contact", _("Contact Person"), "~~")) - declare_filter(201, EventFilterText("event", "event_comment", _("Comment to the event"), "~~")) - declare_filter(201, EventFilterText("event", "event_host_regex", _("Hostname/IP-Address of original event"), "~~")) - declare_filter(201, EventFilterText("event", "event_host", _("Hostname/IP-Address of event, exact match"), "=")) - declare_filter(201, EventFilterText("event", "event_owner", _("Owner of event"), "~~")) - declare_filter(221, EventFilterText("history", "history_who", _("User that performed action"), "~~")) - declare_filter(222, EventFilterText("history", "history_line", _("Line number in history logfile"), "=")) + declare_filter(200, EventFilterText("event", "event_id", "event_id", _("Event ID"), "=")) + declare_filter(200, EventFilterText("event", "event_rule_id", "event_rule_id", _("ID of rule"), "=")) + declare_filter(201, EventFilterText("event", "event_text", "event_text", _("Message/Text of event"), "~~")) + declare_filter(201, EventFilterText("event", "event_application","event_application", _("Application / Syslog-Tag"), "~~")) + declare_filter(201, EventFilterText("event", "event_contact", "event_contact", _("Contact Person"), "~~")) + declare_filter(201, EventFilterText("event", "event_comment", "event_comment", _("Comment to the event"), "~~")) + declare_filter(201, EventFilterText("event", "event_host_regex", "event_host", _("Hostname/IP-Address of original event"), "~~")) + declare_filter(201, EventFilterText("event", "event_host", "event_host", _("Hostname/IP-Address of event, exact match"), "=")) + declare_filter(201, EventFilterText("event", "event_owner", "event_owner", _("Owner of event"), "~~")) + declare_filter(221, EventFilterText("history", "history_who", "history_who", _("User that performed action"), "~~")) + declare_filter(222, EventFilterText("history", "history_line", "history_line", _("Line number in history logfile"), "=")) class EventFilterCount(Filter):