From f1cdc8c9047c39c12c10eb2bd5a936f06cafc424 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 13 Mar 2015 17:19:56 +0100 Subject: [PATCH] Sort host and service overview by display_name by default refs #8716 --- .../library/Monitoring/DataView/HostStatus.php | 6 +++--- .../library/Monitoring/DataView/ServiceStatus.php | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php index 7a7c28b0c..020da34c1 100644 --- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php @@ -90,6 +90,9 @@ class HostStatus extends DataView public function getSortRules() { return array( + 'host_display_name' => array( + 'order' => self::SORT_ASC + ), 'host_severity' => array( 'columns' => array( 'host_severity DESC', @@ -97,9 +100,6 @@ class HostStatus extends DataView 'host_display_name ASC' ) ), - 'host_display_name' => array( - 'order' => self::SORT_ASC - ), 'host_address' => array( 'columns' => array( 'host_ipv4' diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php index 3e3a1c616..d04191068 100644 --- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php @@ -123,6 +123,13 @@ class ServiceStatus extends DataView public function getSortRules() { return array( + 'service_display_name' => array( + 'columns' => array( + 'service_display_name', + 'host_display_name' + ), + 'order' => self::SORT_ASC + ), 'service_severity' => array( 'columns' => array( 'service_severity DESC', @@ -131,13 +138,6 @@ class ServiceStatus extends DataView 'host_display_name ASC' ) ), - 'service_display_name' => array( - 'columns' => array( - 'service_display_name', - 'host_display_name' - ), - 'order' => self::SORT_ASC - ), 'host_severity' => array( 'columns' => array( 'host_severity DESC',