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

Revert "ServicegroupQuery: Use left joins instead of inner joins" 

This reverts commit 23066d2cc4.
This commit is contained in:
Johannes Meyer 2019-09-25 16:20:13 +02:00
parent 94b0689b95
commit 0e729bb85b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
View File

@ -89,7 +89,7 @@ class ServicegroupQuery extends IdoQuery
END END
END END
END', END',
'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR (ss.has_been_checked IS NULL AND ss.servicestatus_id IS NOT NULL) THEN 99 ELSE ss.current_state END' 'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
) )
); );
@ -192,15 +192,15 @@ class ServicegroupQuery extends IdoQuery
protected function joinHostgroups() protected function joinHostgroups()
{ {
$this->requireVirtualTable('services'); $this->requireVirtualTable('services');
$this->select->joinLeft( $this->select->join(
array('hgm' => $this->prefix . 'hostgroup_members'), array('hgm' => $this->prefix . 'hostgroup_members'),
'hgm.host_object_id = s.host_object_id', 'hgm.host_object_id = s.host_object_id',
array() array()
)->joinLeft( )->join(
array('hg' => $this->prefix . 'hostgroups'), array('hg' => $this->prefix . 'hostgroups'),
'hg.hostgroup_id = hgm.hostgroup_id', 'hg.hostgroup_id = hgm.hostgroup_id',
array() array()
)->joinLeft( )->join(
array('hgo' => $this->prefix . 'objects'), array('hgo' => $this->prefix . 'objects'),
'hgo.object_id = hg.hostgroup_object_id AND hgo.objecttype_id = 3 AND hgo.is_active = 1', 'hgo.object_id = hg.hostgroup_object_id AND hgo.objecttype_id = 3 AND hgo.is_active = 1',
array() array()
@ -225,7 +225,7 @@ class ServicegroupQuery extends IdoQuery
*/ */
protected function joinInstances() protected function joinInstances()
{ {
$this->select->joinLeft( $this->select->join(
array('i' => $this->prefix . 'instances'), array('i' => $this->prefix . 'instances'),
'i.instance_id = sg.instance_id', 'i.instance_id = sg.instance_id',
array() array()
@ -237,11 +237,11 @@ class ServicegroupQuery extends IdoQuery
*/ */
protected function joinMembers() protected function joinMembers()
{ {
$this->select->joinLeft( $this->select->join(
array('sgm' => $this->prefix . 'servicegroup_members'), array('sgm' => $this->prefix . 'servicegroup_members'),
'sgm.servicegroup_id = sg.servicegroup_id', 'sgm.servicegroup_id = sg.servicegroup_id',
array() array()
)->joinLeft( )->join(
array('so' => $this->prefix . 'objects'), array('so' => $this->prefix . 'objects'),
'so.object_id = sgm.service_object_id AND so.objecttype_id = 2 AND so.is_active = 1', 'so.object_id = sgm.service_object_id AND so.objecttype_id = 2 AND so.is_active = 1',
array() array()
@ -254,7 +254,7 @@ class ServicegroupQuery extends IdoQuery
protected function joinServices() protected function joinServices()
{ {
$this->requireVirtualTable('members'); $this->requireVirtualTable('members');
$this->select->joinLeft( $this->select->join(
array('s' => $this->prefix . 'services'), array('s' => $this->prefix . 'services'),
's.service_object_id = so.object_id', 's.service_object_id = so.object_id',
array() array()
@ -267,12 +267,12 @@ class ServicegroupQuery extends IdoQuery
protected function joinServicestatus() protected function joinServicestatus()
{ {
$this->requireVirtualTable('services'); $this->requireVirtualTable('services');
$this->select->joinLeft( $this->select->join(
array('hs' => $this->prefix . 'hoststatus'), array('hs' => $this->prefix . 'hoststatus'),
'hs.host_object_id = s.host_object_id', 'hs.host_object_id = s.host_object_id',
array() array()
); );
$this->select->joinLeft( $this->select->join(
array('ss' => $this->prefix . 'servicestatus'), array('ss' => $this->prefix . 'servicestatus'),
'ss.service_object_id = so.object_id', 'ss.service_object_id = so.object_id',
array() array()

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
View File

@ -23,7 +23,7 @@ class ServicegroupsummaryQuery extends IdoQuery
'services_ok' => 'SUM(CASE WHEN service_state = 0 THEN 1 ELSE 0 END)', 'services_ok' => 'SUM(CASE WHEN service_state = 0 THEN 1 ELSE 0 END)',
'services_pending' => 'SUM(CASE WHEN service_state = 99 THEN 1 ELSE 0 END)', 'services_pending' => 'SUM(CASE WHEN service_state = 99 THEN 1 ELSE 0 END)',
'services_severity' => 'MAX(service_severity)', 'services_severity' => 'MAX(service_severity)',
'services_total' => 'SUM(CASE WHEN service_state IS NOT NULL THEN 1 ELSE 0 END)', 'services_total' => 'SUM(1)',
'services_unknown' => 'SUM(CASE WHEN service_state = 3 THEN 1 ELSE 0 END)', 'services_unknown' => 'SUM(CASE WHEN service_state = 3 THEN 1 ELSE 0 END)',
'services_unknown_handled' => 'SUM(CASE WHEN service_state = 3 AND service_handled = 1 THEN 1 ELSE 0 END)', 'services_unknown_handled' => 'SUM(CASE WHEN service_state = 3 AND service_handled = 1 THEN 1 ELSE 0 END)',
'services_unknown_unhandled' => 'SUM(CASE WHEN service_state = 3 AND service_handled = 0 THEN 1 ELSE 0 END)', 'services_unknown_unhandled' => 'SUM(CASE WHEN service_state = 3 AND service_handled = 0 THEN 1 ELSE 0 END)',