From 0738a37fdf88320c41a7078df49463231b9d61df Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 4 Sep 2015 16:35:41 +0200
Subject: [PATCH] Display sticky comments in "Muted" tab

refs #6144
---
 modules/monitoring/configuration.php          | 38 ++++++++++++++-----
 .../Monitoring/DataView/Hoststatus.php        |  3 +-
 .../Monitoring/DataView/Servicestatus.php     |  3 +-
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 755538625..6456686e9 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -265,22 +265,18 @@ $dashboard->add(
  */
 $dashboard = $this->dashboard($this->translate('Overdue'));
 $dashboard->add(
-    $this->translate('Acks Older Than Three Days'),
-    'monitoring/list/comments?comment_type=Ack&comment_timestamp<-3 days'
+    $this->translate('Acknowledgements Active For At Least Three Days'),
+    'monitoring/list/comments?comment_type=Ack&comment_timestamp<-3 days&sort=comment_timestamp&dir=asc'
 );
 $dashboard->add(
-    $this->translate('Downtimes Older Than Three Days'),
+    $this->translate('Downtimes Active For More Than Three Days'),
     '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'
-);
 
 /*
  * Muted Objects
  */
-$dashboard = $this->dashboard($this->translate('Muted Objects'));
+$dashboard = $this->dashboard($this->translate('Muted'));
 $dashboard->add(
     $this->translate('Disabled Service Notifications'),
     'monitoring/list/services?service_notifications_enabled=0&limit=10'
@@ -297,6 +293,14 @@ $dashboard->add(
     $this->translate('Disabled Host Checks'),
     'monitoring/list/hosts?host_active_checks_enabled=0&limit=10'
 );
+$dashboard->add(
+    $this->translate('Acknowledged Problem Services'),
+    'monitoring/list/services?service_acknowledgement_type=2&service_problem=1&sort=service_state&limit=10'
+);
+$dashboard->add(
+    $this->translate('Acknowledged Problem Hosts'),
+    'monitoring/list/hosts?host_acknowledgement_type=2&host_problem=1&sort=host_severity&limit=10'
+);
 
 /*
  * Activity Stream
@@ -323,9 +327,25 @@ $dashboard->add(
     'monitoring/list/eventhistory?type=dt_end&sort=timestamp&dir=desc&limit=8'
 );
 
+/*
+ * Stats
+ */
+$dashboard = $this->dashboard($this->translate('Stats'));
+$dashboard->add(
+    $this->translate('Weekly Alert Summary'),
+    'monitoring/alertsummary/index?limit=5&interval=1w'
+);
+$dashboard->add(
+    $this->translate('Check Stats'),
+    'monitoring/health/stats'
+);
+$dashboard->add(
+    $this->translate('Process Information'),
+    'monitoring/health/info'
+);
+
 /*
  * CSS
  */
 $this->provideCssFile('colors.less');
 $this->provideCssFile('service-grid.less');
-
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'
         );
     }