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

monitoring: Remove HoststatusQuery::getGroup() 

refs #9956
This commit is contained in:
Eric Lippmann 2015-09-29 22:43:09 +02:00
parent 70717169c2
commit 02eee7a603
1 changed files with 10 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
View File

@ -12,6 +12,16 @@ class HoststatusQuery extends IdoQuery
*/ */
protected $allowCustomVars = true; protected $allowCustomVars = true;
/**
* {@inheritdoc}
*/
protected $groupBase = array('hosts' => array('ho.object_id', 'h.host_id'));
/**
* {@inheritdoc}
*/
protected $groupOrigin = array('hostgroups', 'servicegroups', 'services');
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@ -278,76 +288,6 @@ class HoststatusQuery extends IdoQuery
); );
} }
/**
* {@inheritdoc}
*/
public function getGroup()
{
$group = parent::getGroup() ?: array();
if (! is_array($group)) {
$group = array($group);
}
$groupedTables = array();
if ($this->hasJoinedVirtualTable('servicegroups')) {
$group[] = 'ho.object_id';
$group[] = 'h.host_id';
$groupedTables['hosts'] = true;
$serviceGroupColumns = array_keys($this->columnMap['servicegroups']);
$selectedServiceGroupColumns = array_intersect($serviceGroupColumns, array_keys($this->columns));
if (! empty($selectedServiceGroupColumns)) {
$group[] = 'sgo.object_id';
$group[] = 'sg.servicegroup_id';
$groupedTables['servicegroups'] = true;
}
}
if ($this->hasJoinedVirtualTable('hostgroups')) {
if (! isset($groupedTables['hosts'])) {
$group[] = 'ho.object_id';
$group[] = 'h.host_id';
$groupedTables['hosts'] = true;
}
$hostGroupColumns = array_keys($this->columnMap['hostgroups']);
$selectedHostGroupColumns = array_intersect($hostGroupColumns, array_keys($this->columns));
if (! empty($selectedHostGroupColumns)) {
$group[] = 'hgo.object_id';
$group[] = 'hg.hostgroup_id';
$groupedTables['hostgroups'] = true;
}
}
if (! empty($groupedTables)) {
foreach ($this->columns as $alias => $column) {
if ($column instanceof Zend_Db_Expr || $column === '(NULL)') {
continue;
}
$tableName = $this->aliasToTableName(
$this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias)
);
if (isset($groupedTables[$tableName])) {
continue;
}
switch ($tableName) {
case 'hoststatus':
$group[] = 'hs.hoststatus_id';
break;
case 'serviceproblemsummary':
$group[] = 'sps.unhandled_services_count';
break;
case 'services':
$group[] = 'so.object_id';
$group[] = 's.service_id';
break;
case 'instances':
$group[] = 'i.instance_id';
break;
default:
continue 2;
}
$groupedTables[$tableName] = true;
}
}
return $group;
}
/** /**
* Query the service problem summary for all hosts of this query's result set * Query the service problem summary for all hosts of this query's result set
* *