From 1964cc53d56b60fc93bd099b32e75a81a629d965 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 1 Sep 2015 17:59:04 +0200
Subject: [PATCH] Revert "Provide dashlets for sticky-comments"

This reverts commit 6ada9ce047b5ecb4778204c1a64511260fba7b68.
---
 .../monitoring/application/controllers/ListController.php | 1 -
 modules/monitoring/configuration.php                      | 8 ++------
 .../monitoring/library/Monitoring/DataView/Hoststatus.php | 3 +--
 .../library/Monitoring/DataView/Servicestatus.php         | 3 +--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f30432686..44172f1ea 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -155,7 +155,6 @@ 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 e1a8d58d2..8740575ba 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -271,12 +271,8 @@ $dashboard->add(
     'monitoring/list/downtimes?downtime_is_in_effect=1&downtime_scheduled_start<-3%20days&sort=downtime_start&dir=asc'
 );
 $dashboard->add(
-    $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'
+    $this->translate('Oldest Sticky Comments'),
+    'monitoring/list/comments?comment_type=Ack&TODO'
 );
 
 /*
diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
index 413f175f1..05385763c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
@@ -58,8 +58,7 @@ class HostStatus extends DataView
             'host_modified_host_attributes',
             'host_severity',
             'host_problem',
-            'host_ipv4',
-            'host_acknowledgement_type'
+            'host_ipv4'
         );
     }
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
index f12c66535..ff68474f1 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
@@ -92,8 +92,7 @@ class ServiceStatus extends DataView
             'service_flap_detection_enabled',
             'service_flap_detection_enabled_changed',
             'service_modified_service_attributes',
-            'service_host_name',
-            'service_acknowledgement_type'
+            'service_host_name'
         );
     }