From 5ccf6a7efa6f530c3424d4d98ce6daa69d2ab79f Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 10 Apr 2015 14:25:26 +0200 Subject: [PATCH] DowntimeQuery: Remove redundant query columns refs #8613 --- .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php | 4 +--- modules/monitoring/library/Monitoring/DataView/Downtime.php | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php index 3f0d0293a7..47db6af94b 100644 --- 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 index 04cf872dbd..e2eaf7aee3 100644 --- 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',