tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-26 03:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

NotificationQuery: Do not fetch non-history related columns for history queries

Browse Source 
refs #9009
This commit is contained in:
Johannes Meyer 2015-06-18 14:34:30 +02:00
parent f2425a97d5
commit dd81de39fd
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
View File

@ -96,14 +96,15 @@ class NotificationQuery extends IdoQuery
*/ */
protected function joinHosts() protected function joinHosts()
{ {
$columns = array_keys( $columns = array_keys($this->columnMap['hosts']);
$this->columnMap['notifications'] + $this->columnMap['hosts']
);
foreach ($this->columnMap['services'] as $column => $_) { foreach ($this->columnMap['services'] as $column => $_) {
$columns[$column] = new Zend_Db_Expr('NULL'); $columns[$column] = new Zend_Db_Expr('NULL');
} }
if ($this->fetchHistoryColumns) { if ($this->fetchHistoryColumns) {
$columns = array_merge($columns, array_keys($this->columnMap['history'])); $columns = array_merge($columns, array_keys($this->columnMap['history']));
$columns[] = 'object_type';
} else {
$columns = array_merge($columns, array_keys($this->columnMap['notifications']));
} }
$hosts = $this->createSubQuery('hostnotification', $columns); $hosts = $this->createSubQuery('hostnotification', $columns);
$this->subQueries[] = $hosts; $this->subQueries[] = $hosts;
@ -115,11 +116,12 @@ class NotificationQuery extends IdoQuery
*/ */
protected function joinServices() protected function joinServices()
{ {
$columns = array_keys( $columns = array_keys($this->columnMap['hosts'] + $this->columnMap['services']);
$this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
);
if ($this->fetchHistoryColumns) { if ($this->fetchHistoryColumns) {
$columns = array_merge($columns, array_keys($this->columnMap['history'])); $columns = array_merge($columns, array_keys($this->columnMap['history']));
$columns[] = 'object_type';
} else {
$columns = array_merge($columns, array_keys($this->columnMap['notifications']));
} }
$services = $this->createSubQuery('servicenotification', $columns); $services = $this->createSubQuery('servicenotification', $columns);
$this->subQueries[] = $services; $this->subQueries[] = $services;