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

EventHistoryQuery: Drop column `service_host_name' 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-09 14:19:31 +02:00
parent 84a2727523
commit 2c38ccda5c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/monitoring/application/controllers/AlertsummaryController.php
View File

@ -263,7 +263,7 @@ class Monitoring_AlertsummaryController extends Controller
$interval = $this->getInterval(); $interval = $this->getInterval();
$query = $this->backend->select()->from( $query = $this->backend->select()->from(
'EventHistory', 'eventHistory',
array( array(
'host_name', 'host_name',
'service_description', 'service_description',
@ -275,8 +275,7 @@ class Monitoring_AlertsummaryController extends Controller
'output', 'output',
'type', 'type',
'host', 'host',
'service', 'service'
'service_host_name'
) )
); );

3
modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
View File

@ -40,8 +40,7 @@ class EventHistoryQuery extends IdoQuery
'attempt' => 'eh.attempt', 'attempt' => 'eh.attempt',
'max_attempts' => 'eh.max_attempts', 'max_attempts' => 'eh.max_attempts',
'output' => 'eh.output', // we do not want long_output 'output' => 'eh.output', // we do not want long_output
'type' => 'eh.type', 'type' => 'eh.type'
'service_host_name' => 'eho.name1 COLLATE latin1_general_ci'
), ),
'hostgroups' => array( 'hostgroups' => array(
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',

3
modules/monitoring/library/Monitoring/DataView/EventHistory.php
View File

@ -30,8 +30,7 @@ class EventHistory extends DataView
'output', 'output',
'type', 'type',
'host', 'host',
'service', 'service'
'service_host_name'
); );
} }