diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 44172f1ea..f30432686 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -155,6 +155,7 @@ class Monitoring_ListController extends Controller 'service_notes_url', 'service_active_checks_enabled', 'service_passive_checks_enabled', + 'service_acknowledgement_type', 'current_check_attempt' => 'service_current_check_attempt', 'max_check_attempts' => 'service_max_check_attempts' ), $this->addColumns()); diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php index 8740575ba..e1a8d58d2 100644 --- a/modules/monitoring/configuration.php +++ b/modules/monitoring/configuration.php @@ -271,8 +271,12 @@ $dashboard->add( 'monitoring/list/downtimes?downtime_is_in_effect=1&downtime_scheduled_start<-3%20days&sort=downtime_start&dir=asc' ); $dashboard->add( - $this->translate('Oldest Sticky Comments'), - 'monitoring/list/comments?comment_type=Ack&TODO' + $this->translate('Host Sticky Acknowledgements Older Than Three Days'), + '/monitoring/list/hosts?host_acknowledgement_type=2&host_last_state_change<-3%20days' +); +$dashboard->add( + $this->translate('Service Sticky Acknowledgements, Older Than Three Days'), + '/monitoring/list/services?service_acknowledgement_type=2&service_last_state_change<-3%20days' ); /* diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php index 05385763c..413f175f1 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php @@ -58,7 +58,8 @@ class HostStatus extends DataView 'host_modified_host_attributes', 'host_severity', 'host_problem', - 'host_ipv4' + 'host_ipv4', + 'host_acknowledgement_type' ); } diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php index ff68474f1..f12c66535 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php @@ -92,7 +92,8 @@ class ServiceStatus extends DataView 'service_flap_detection_enabled', 'service_flap_detection_enabled_changed', 'service_modified_service_attributes', - 'service_host_name' + 'service_host_name', + 'service_acknowledgement_type' ); }