diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index c0ae1133f..035a7e0ad 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -90,11 +90,12 @@ class ListController extends Controller $this->setupLimitControl(); $this->setupPaginationControl($this->view->hosts); $this->setupSortControl(array( - 'host_severity' => $this->translate('Severity'), - 'host_state' => $this->translate('Current State'), - 'host_display_name' => $this->translate('Hostname'), - 'host_address' => $this->translate('Address'), - 'host_last_check' => $this->translate('Last Check') + 'host_severity' => $this->translate('Severity'), + 'host_state' => $this->translate('Current State'), + 'host_display_name' => $this->translate('Hostname'), + 'host_address' => $this->translate('Address'), + 'host_last_check' => $this->translate('Last Check'), + 'host_last_state_change' => $this->translate('Last State Change') ), $query); $summary = $query->getQuery()->queryServiceProblemSummary(); @@ -155,15 +156,16 @@ class ListController extends Controller $this->setupLimitControl(); $this->setupPaginationControl($this->view->services); $this->setupSortControl(array( - 'service_severity' => $this->translate('Service Severity'), - 'service_state' => $this->translate('Current Service State'), - 'service_display_name' => $this->translate('Service Name'), - 'service_last_check' => $this->translate('Last Service Check'), - 'host_severity' => $this->translate('Host Severity'), - 'host_state' => $this->translate('Current Host State'), - 'host_display_name' => $this->translate('Hostname'), - 'host_address' => $this->translate('Host Address'), - 'host_last_check' => $this->translate('Last Host Check') + 'service_severity' => $this->translate('Service Severity'), + 'service_state' => $this->translate('Current Service State'), + 'service_display_name' => $this->translate('Service Name'), + 'service_last_check' => $this->translate('Last Service Check'), + 'service_last_state_change' => $this->translate('Last State Change'), + 'host_severity' => $this->translate('Host Severity'), + 'host_state' => $this->translate('Current Host State'), + 'host_display_name' => $this->translate('Hostname'), + 'host_address' => $this->translate('Host Address'), + 'host_last_check' => $this->translate('Last Host Check') ), $query); $stats = $this->backend->select()->from('servicestatussummary', array( diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php index 220ce2226..c284a76fb 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php @@ -117,7 +117,7 @@ class HostStatus extends DataView 'order' => self::SORT_ASC ), 'host_last_state_change' => array( - 'order' => self::SORT_ASC + 'order' => self::SORT_DESC ) ); } diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php index 389bc9ae0..0b03c06ad 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php @@ -123,6 +123,9 @@ class ServiceStatus extends DataView ), 'order' => self::SORT_DESC ), + 'service_last_state_change' => array( + 'order' => self::SORT_DESC + ), 'host_severity' => array( 'columns' => array( 'host_severity',