tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-24 22:34:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

GroupsummaryQuery: distinct columns/desiredColumns

Browse Source 
I guess this needs some more investigation, desiredColumns are the
ones the user asked for ([alias => ]column), with column being once
again an alias in the "real" query. Alias resolution used to work
better long time ago, we should reflect on this.
This commit is contained in:
Thomas Gelf 2014-06-17 12:42:50 +00:00
parent 027ef6ede3
commit dab90d6c4a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
View File

@ -71,8 +71,9 @@ class GroupSummaryQuery extends IdoQuery
'host_state',
'host_name'
);
// Prepend group column since we'll use columns index 0 later for grouping
if (in_array('servicegroup', $this->getColumns())) {
if (in_array('servicegroup', $this->desiredColumns)) {
array_unshift($columns, 'servicegroup');
} else {
array_unshift($columns, 'hostgroup');
@ -80,21 +81,22 @@ class GroupSummaryQuery extends IdoQuery
$hosts = $this->createSubQuery(
'Hoststatus',
$columns + array(
'state' => 'host_state',
'acknowledged' => 'host_acknowledged',
'in_downtime' => 'host_in_downtime'
'state' => 'host_state',
'acknowledged' => 'host_acknowledged',
'in_downtime' => 'host_in_downtime'
)
);
$services = $this->createSubQuery(
'Status',
$columns + array(
'state' => 'service_state',
'acknowledged' => 'service_acknowledged',
'in_downtime' => 'service_in_downtime'
'state' => 'service_state',
'acknowledged' => 'service_acknowledged',
'in_downtime' => 'service_in_downtime'
)
);
$union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
$this->select->from(array('statussummary' => $union), array())->group($columns[0]);
$this->select->from(array('statussummary' => $union), '*')->group($columns[0]);
$this->joinedVirtualTables = array(
'servicestatussummary' => true,
'hoststatussummary' => true