diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index b167c5e43..e56bb62af 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -4,7 +4,6 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\Backend; -use Icinga\Module\Monitoring\DataView\DataView; use Icinga\Web\Url; use Icinga\Web\Hook; use Icinga\Web\Widget\Tabextension\DashboardAction; @@ -500,19 +499,19 @@ class Monitoring_ListController extends Controller { $this->addTitleTab('servicematrix'); $this->setAutorefreshInterval(15); - $dataview = $this->backend->select()->from('serviceStatus', array( + $query = $this->backend->select()->from('serviceStatus', array( 'host_name', 'service_description', 'service_state', 'service_output', 'service_handled' )); - $this->applyFilters($dataview); + $this->applyFilters($query); $this->setupSortControl(array( 'host_name' => 'Hostname', 'service_description' => 'Service description' )); - $pivot = $dataview->pivot('service_description', 'host_name'); + $pivot = $query->pivot('service_description', 'host_name'); $this->view->pivot = $pivot; $this->view->horizontalPaginator = $pivot->paginateXAxis(); $this->view->verticalPaginator = $pivot->paginateYAxis(); @@ -572,10 +571,6 @@ class Monitoring_ListController extends Controller /** * Apply current user's `monitoring/filter' restrictions on the given data view - * - * @param DataView $dataView - * - * @return DataView */ protected function applyRestrictions($query) {