tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Sort host groups and service groups by their alias

Browse Source 
refs #7843
This commit is contained in:
Eric Lippmann 2015-01-23 15:46:51 +01:00
parent 910065436b
commit 53a4f10253
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/monitoring/application/controllers/ListController.php
View File

@ -523,18 +523,20 @@ class Monitoring_ListController extends Controller
'services_critical_last_state_change_unhandled', 'services_critical_last_state_change_unhandled',
'services_unknown_last_state_change_unhandled', 'services_unknown_last_state_change_unhandled',
'services_total' 'services_total'
)); ))->order('services_severity')->order('servicegroup_alias');
// TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
// service groups. We should separate them.
$this->filterQuery($query); $this->filterQuery($query);
$this->view->servicegroups = $query->paginate(); $this->view->servicegroups = $query->paginate();
$this->setupSortControl(array( $this->setupSortControl(array(
'services_severity' => $this->translate('Severity'), 'services_severity' => $this->translate('Severity'),
'servicegroup' => $this->translate('Service Group Name'), 'servicegroup_alias' => $this->translate('Service Group Name'),
'services_total' => $this->translate('Total Services'), 'services_total' => $this->translate('Total Services'),
'services_ok' => $this->translate('Services OK'), 'services_ok' => $this->translate('Services OK'),
'services_unknown' => $this->translate('Services UNKNOWN'), 'services_unknown' => $this->translate('Services UNKNOWN'),
'services_critical' => $this->translate('Services CRITICAL'), 'services_critical' => $this->translate('Services CRITICAL'),
'services_warning' => $this->translate('Services WARNING'), 'services_warning' => $this->translate('Services WARNING'),
'services_pending' => $this->translate('Services PENDING') 'services_pending' => $this->translate('Services PENDING')
)); ));
} }
@ -571,12 +573,14 @@ class Monitoring_ListController extends Controller
'services_critical_last_state_change_unhandled', 'services_critical_last_state_change_unhandled',
'services_unknown_last_state_change_unhandled', 'services_unknown_last_state_change_unhandled',
'services_total' 'services_total'
)); ))->order('services_severity')->order('hostgroup_alias');
// TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
// service groups. We should separate them.
$this->filterQuery($query); $this->filterQuery($query);
$this->view->hostgroups = $query->paginate(); $this->view->hostgroups = $query->paginate();
$this->setupSortControl(array( $this->setupSortControl(array(
'services_severity' => $this->translate('Severity'), 'services_severity' => $this->translate('Severity'),
'hostgroup' => $this->translate('Host Group Name'), 'hostgroup_alias' => $this->translate('Host Group Name'),
'services_total' => $this->translate('Total Services'), 'services_total' => $this->translate('Total Services'),
'services_ok' => $this->translate('Services OK'), 'services_ok' => $this->translate('Services OK'),
'services_unknown' => $this->translate('Services UNKNOWN'), 'services_unknown' => $this->translate('Services UNKNOWN'),