tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DowntimeQuery: Remove redundant query columns 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-10 14:25:26 +02:00
parent 0f0727491e
commit 5ccf6a7efa
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
View File

@ -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'
),

2
modules/monitoring/library/Monitoring/DataView/Downtime.php
View File

@ -27,8 +27,6 @@ class Downtime extends DataView
'downtime_is_in_effect',
'downtime_triggered_by_id',
'downtime_internal_id',
'downtime_host',
'downtime_service',
'downtime_host_state',
'downtime_service_state',
'host_display_name',