From fe488c7b77e3ece1d89395bb6213738724189773 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 3 Jun 2015 12:54:25 +0200 Subject: [PATCH] monitoring: Restrict the service group overview refs #9009 --- .../application/controllers/ListController.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index f46370261..5f5162532 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -481,8 +481,8 @@ class Monitoring_ListController extends Controller 'servicegroup_alias', 'servicegroup_name', 'services_critical_handled', - 'services_critical_last_state_change_handled', - 'services_critical_last_state_change_unhandled', + 'services_critical_last_state_change_handled' => 'services_critical_handled_last_state_change', + 'services_critical_last_state_change_unhandled' => 'services_critical_unhandled_last_state_change', 'services_critical_unhandled', 'services_ok', 'services_ok_last_state_change', @@ -490,15 +490,18 @@ class Monitoring_ListController extends Controller 'services_pending_last_state_change', 'services_total', 'services_unknown_handled', - 'services_unknown_last_state_change_handled', - 'services_unknown_last_state_change_unhandled', + 'services_unknown_last_state_change_handled' => 'services_unknown_handled_last_state_change', + 'services_unknown_last_state_change_unhandled' => 'services_unknown_unhandled_last_state_change', 'services_unknown_unhandled', 'services_warning_handled', - 'services_warning_last_state_change_handled', - 'services_warning_last_state_change_unhandled', + 'services_warning_last_state_change_handled' => 'services_warning_handled_last_state_change', + 'services_warning_last_state_change_unhandled' => 'services_warning_unhandled_last_state_change', 'services_warning_unhandled' )); $this->filterQuery($query); + + $this->applyRestriction('monitoring/filter/objects', $query); + $this->view->servicegroups = $query; $this->setupLimitControl();