[checkmk-commits] Check_MK Git: check_mk: #2209 New filter for selecting hosts/services in/ out of their service period

Module: check_mk Branch: master Commit: 042cb4adf443734a0cfc42df6f179ea36b52df75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=042cb4adf44373… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 20 15:25:23 2015 +0200 #2209 New filter for selecting hosts/services in/out of their service period --- .werks/2209 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 4 ++++ web/plugins/visuals/filters.py | 6 ++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/2209 b/.werks/2209 new file mode 100644 index 0000000..82d1d05 --- /dev/null +++ b/.werks/2209 @@ -0,0 +1,9 @@ +Title: New filter for selecting hosts/services in/out of their service period +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1429536304 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 53eb04d..79cb1f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -352,6 +352,7 @@ * 2174 Added action popup to host & service views, supporting custom actions now... * 2175 Added icon uploader, unified icon selection... * 2200 New filter for (de-)selecting preliminary notifications to "check-mk-notify"... + * 2209 New filter for selecting hosts/services in/out of their service period * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index a4447b2..66bf33d 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -72,6 +72,7 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['host_scheduled_downtime_depth', 'host_in_notification_period', + 'host_in_service_period', 'hoststate', 'siteopt', 'host_acknowledged', @@ -193,6 +194,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['service_in_notification_period', + 'service_in_service_period', 'optservicegroup', 'service_notifications_enabled', 'host_in_notification_period', @@ -1110,6 +1112,7 @@ multisite_builtin_views.update({ 'show_filters': [ 'host_scheduled_downtime_depth', 'host_in_notification_period', + 'host_in_service_period', 'hoststate', 'siteopt', 'hostregex', @@ -1171,6 +1174,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['service_in_notification_period', + 'service_in_service_period', 'optservicegroup', 'optservice_contactgroup', 'hostgroups', diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 7b50809..5fb04c8 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -487,12 +487,14 @@ declare_filter(251, FilterNagiosExpression("service", "has_performance_data", "Filter: service_perf_data != \n", "Filter: service_perf_data = \n")) -declare_filter(130, FilterNagiosFlag("host", "host_in_notification_period", _("Host in notif. period"))) +declare_filter(130, FilterNagiosFlag("host", "host_in_notification_period", _("Host in notification period"))) +declare_filter(130, FilterNagiosFlag("host", "host_in_service_period", _("Host in service period"))) declare_filter(131, FilterNagiosFlag("host", "host_acknowledged", _("Host problem has been acknowledged"))) declare_filter(132, FilterNagiosFlag("host", "host_active_checks_enabled", _("Host active checks enabled"))) declare_filter(133, FilterNagiosFlag("host", "host_notifications_enabled", _("Host notifications enabled"))) declare_filter(230, FilterNagiosFlag("service", "service_acknowledged", _("Problem acknowledged"))) -declare_filter(231, FilterNagiosFlag("service", "service_in_notification_period", _("Service in notif. per."))) +declare_filter(231, FilterNagiosFlag("service", "service_in_notification_period", _("Service in notification period"))) +declare_filter(231, FilterNagiosFlag("service", "service_in_service_period", _("Service in service period"))) declare_filter(233, FilterNagiosFlag("service", "service_active_checks_enabled", _("Active checks enabled"))) declare_filter(234, FilterNagiosFlag("service", "service_notifications_enabled", _("Notifications enabled"))) declare_filter(236, FilterNagiosFlag("service", "service_is_flapping", _("Flapping")))