monitoring: Default to the sort rules of the service group summary

refs #8241
This commit is contained in:
Eric Lippmann 2015-05-21 12:41:59 +02:00
parent 1a1f93db23
commit 0db7cfca88
1 changed files with 19 additions and 21 deletions

View File

@ -470,34 +470,32 @@ class Monitoring_ListController extends Controller
$this->setAutorefreshInterval(12); $this->setAutorefreshInterval(12);
$query = $this->backend->select()->from('servicegroupsummary', array( $query = $this->backend->select()->from('servicegroupsummary', array(
'servicegroup_name',
'servicegroup_alias',
'hosts_up',
'hosts_unreachable_handled',
'hosts_unreachable_unhandled',
'hosts_down_handled', 'hosts_down_handled',
'hosts_down_unhandled', 'hosts_down_unhandled',
'hosts_pending', 'hosts_pending',
'services_ok', 'hosts_unreachable_handled',
'services_unknown_handled', 'hosts_unreachable_unhandled',
'services_unknown_unhandled', 'hosts_up',
'servicegroup_alias',
'servicegroup_name',
'services_critical_handled', 'services_critical_handled',
'services_critical_unhandled',
'services_warning_handled',
'services_warning_unhandled',
'services_pending',
'services_ok_last_state_change',
'services_pending_last_state_change',
'services_warning_last_state_change_handled',
'services_critical_last_state_change_handled', 'services_critical_last_state_change_handled',
'services_unknown_last_state_change_handled',
'services_warning_last_state_change_unhandled',
'services_critical_last_state_change_unhandled', 'services_critical_last_state_change_unhandled',
'services_critical_unhandled',
'services_ok',
'services_ok_last_state_change',
'services_pending',
'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_unhandled',
'services_total' 'services_unknown_unhandled',
))->order('servicegroup_alias'); 'services_warning_handled',
// TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and 'services_warning_last_state_change_handled',
// service groups. We should separate them. 'services_warning_last_state_change_unhandled',
'services_warning_unhandled'
));
$this->filterQuery($query); $this->filterQuery($query);
$this->view->servicegroups = $query; $this->view->servicegroups = $query;