DowntimeQuery: Remove redundant query columns

refs #8613
Icinga · Apr 10, 2015 · 5ccf6a7 · 5ccf6a7
1 parent 0f07274
commit 5ccf6a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -28,11 +28,9 @@ class DowntimeQuery extends IdoQuery
             'downtime_is_in_effect'     => 'sd.is_in_effect',
             'downtime_internal_id'      => 'sd.internal_downtime_id',
             'downtime_objecttype'       => "CASE WHEN ho.object_id IS NULL THEN 'service' ELSE 'host' END",
-            'downtime_host'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci', // #7278, #7279
             'host'                      => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
             'host_name'                 => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
-            'downtime_service'          => 'so.name2 COLLATE latin1_general_ci',
-            'service'                   => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
+            'service'                   => 'so.name2 COLLATE latin1_general_ci',
             'service_description'       => 'so.name2',
             'service_host_name'         => 'so.name1'
         ),

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -27,8 +27,6 @@ public function getColumns()
             'downtime_is_in_effect',
             'downtime_triggered_by_id',
             'downtime_internal_id',
-            'downtime_host',
-            'downtime_service',
             'downtime_host_state',
             'downtime_service_state',
             'host_display_name',