Provide dashlets for sticky-comments

refs #6144
Icinga · Aug 31, 2015 · 6ada9ce · 6ada9ce
1 parent fa93b7e
commit 6ada9ce
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
@@ -155,6 +155,7 @@ public function servicesAction()
             '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
@@ -271,8 +271,12 @@
     '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
@@ -58,7 +58,8 @@ public function getColumns()
             '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
@@ -92,7 +92,8 @@ public function getColumns()
             'service_flap_detection_enabled',
             'service_flap_detection_enabled_changed',
             'service_modified_service_attributes',
-            'service_host_name'
+            'service_host_name',
+            'service_acknowledgement_type'
         );
     }