[checkmk-commits] Check_MK Git: check_mk: #2299 FIX Fixed search filter for check command when command was active

Module: check_mk Branch: master Commit: 150ecfb6460b4ef29f21b9c0de76ccbe252db6cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=150ecfb6460b4e… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Sun May 24 13:50:42 2015 +0200 #2299 FIX Fixed search filter for check command when command was active This filter is e.g. contained in the view for searching services. When you searched for active checks (e.g. <tt>check_http</tt>) then the result was always empty because of the parameter of the check. This has been fixed. --- .werks/2299 | 12 ++++++++++++ ChangeLog | 3 ++- web/plugins/visuals/filters.py | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/2299 b/.werks/2299 new file mode 100644 index 0000000..fcedb7f --- /dev/null +++ b/.werks/2299 @@ -0,0 +1,12 @@ +Title: Fixed search filter for check command when command was active +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1432468174 + +This filter is e.g. contained in the view for searching services. When you searched +for active checks (e.g. <tt>check_http</tt>) then the result was always empty because +of the parameter of the check. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 5e62791..aaa8d33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,9 +192,9 @@ * 1247 alcatel_timetra_chassis: New Check for Slots, Power Supplies, MDAs, cf cards and Fans of Alcatel Switches Supporting the TIMETRA-CHASSIS-MIB * 1248 acme_sbc, acme_sbc.settings: New Checks to monitor an ACME Session Border Controller... * 2256 mk_mysql: MySQL monitoring is now available for windows... - * 2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls... * 1249 alcatel_cpu, alcatel_temp: New checks for Alcatel switches based on IND1 MIB * 1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB + * 2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... @@ -459,6 +459,7 @@ * 2251 FIX: Adding views to dashboards / reports is now respecing all set filters... * 2253 FIX: Availability context button is now visible again for host- and servicegroups * 2257 FIX: Improved handling of duplicate hostnames across different sites... + * 2299 FIX: Fixed search filter for check command when command was active... WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 54fe5f3..004969b 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -341,9 +341,9 @@ class FilterQueryDropdown(Filter): return "" declare_filter(110, FilterQueryDropdown("host_check_command", _("Host check command"), "host", \ - "GET commands\nCache: reload\nColumns: name\n", "Filter: host_check_command = %s\n")) + "GET commands\nCache: reload\nColumns: name\n", "Filter: host_check_command ~ ^%s(!.*)?\n")) declare_filter(210, FilterQueryDropdown("check_command", _("Service check command"), "service", \ - "GET commands\nCache: reload\nColumns: name\n", "Filter: service_check_command = %s\n")) + "GET commands\nCache: reload\nColumns: name\n", "Filter: service_check_command ~ ^%s(!.*)?$\n")) class FilterServiceState(Filter): def __init__(self, name, title, prefix):