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

Merge pull request #3278 from Icinga/bugfix/drop-obsolete-aggregates-from-event-history-query-2860 

EventHistory: Drop obsolete SUM aggregates
This commit is contained in:
lippserd 2018-01-17 14:07:20 +01:00 committed by GitHub
parent 7d83543bb1 b07e4b409f
commit f4c46cde19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php
View File

@ -29,11 +29,6 @@ class EventhistoryQuery extends IdoQuery
protected $columnMap = array( protected $columnMap = array(
'eventhistory' => array( 'eventhistory' => array(
'id' => 'eh.id', 'id' => 'eh.id',
'cnt_notification' => "SUM(CASE eh.type WHEN 'notify' THEN 1 ELSE 0 END)",
'cnt_hard_state' => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)",
'cnt_soft_state' => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)",
'cnt_downtime_start' => "SUM(CASE eh.type WHEN 'dt_start' THEN 1 ELSE 0 END)",
'cnt_downtime_end' => "SUM(CASE eh.type WHEN 'dt_end' THEN 1 ELSE 0 END)",
'host_name' => 'eh.host_name', 'host_name' => 'eh.host_name',
'service_description' => 'eh.service_description', 'service_description' => 'eh.service_description',
'object_type' => 'eh.object_type', 'object_type' => 'eh.object_type',

5
modules/monitoring/library/Monitoring/DataView/Eventhistory.php
View File

@ -13,11 +13,6 @@ class EventHistory extends DataView
return array( return array(
'id', 'id',
'instance_name', 'instance_name',
'cnt_notification',
'cnt_hard_state',
'cnt_soft_state',
'cnt_downtime_start',
'cnt_downtime_end',
'host_name', 'host_name',
'host_display_name', 'host_display_name',
'service_description', 'service_description',