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

HostgroupsummaryQuery: Add empty groups to the union 

refs #3928
This commit is contained in:
Johannes Meyer 2019-09-26 12:47:48 +02:00
parent fae60f06bf
commit faca6d53c8
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyhostgroupQuery.php Normal file
View File

@ -0,0 +1,36 @@
<?php
/* Icinga Web 2 | (c) 2019 Icinga GmbH | GPLv2+ */
namespace Icinga\Module\Monitoring\Backend\Ido\Query;
class EmptyhostgroupQuery extends HostgroupQuery
{
protected $subQueryTargets = [];
protected $columnMap = [
'hostgroups' => [
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1',
'host_name' => '(NULL)',
'service_description' => '(NULL)',
'servicegroup_name' => '(NULL)'
],
'instances' => [
'instance_name' => 'i.instance_name'
]
];
protected function joinBaseTables()
{
parent::joinBaseTables();
$this->select->joinLeft(
['ehgm' => $this->prefix . 'hostgroup_members'],
'ehgm.hostgroup_id = hg.hostgroup_id',
[]
);
$this->select->group(['hgo.object_id', 'hg.hostgroup_id']);
$this->select->having('COUNT(ehgm.hostgroup_member_id) = ?', 0);
}
}

19
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
View File

@ -108,7 +108,24 @@ class HostgroupsummaryQuery extends IdoQuery
)
);
$this->subQueries[] = $services;
$this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
$emptyGroups = $this->createSubQuery(
'Emptyhostgroup',
[
'hostgroup_alias',
'hostgroup_name',
'host_handled' => new Zend_Db_Expr('NULL'),
'host_severity' => new Zend_Db_Expr('0'),
'host_state' => new Zend_Db_Expr('NULL'),
'service_handled' => new Zend_Db_Expr('NULL'),
'service_severity' => new Zend_Db_Expr('0'),
'service_state' => new Zend_Db_Expr('NULL'),
]
);
$this->subQueries[] = $emptyGroups;
$this->summaryQuery = $this->db->select()->union(
[$hosts, $services, $emptyGroups],
Zend_Db_Select::SQL_UNION_ALL
);
$this->select->from(array('hostgroupsummary' => $this->summaryQuery), array());
$this->group(array('hostgroup_name', 'hostgroup_alias'));
$this->joinedVirtualTables['hostgroupsummary'] = true;