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

IdoQuery: Join customvars with only live references

Browse Source
This commit is contained in:
Johannes Meyer 2022-02-23 14:35:59 +01:00
parent 00bf541857
commit 4e879ccb9a
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -1199,14 +1199,32 @@ abstract class IdoQuery extends DbQuery
$this->customVars[strtolower($customvar)] = $alias; $this->customVars[strtolower($customvar)] = $alias;
if ($this->hasJoinedVirtualTable('services')) { if ($type === 'host') {
$leftcol = 's.' . $type . '_object_id'; if (
} elseif ($type === 'service') { $this instanceof HostserviceproblemsummaryQuery
$this->requireVirtualTable('services'); || $this instanceof ServicecommentQuery
$leftcol = 's.service_object_id'; || $this instanceof ServicedowntimeQuery
} else { || $this instanceof ServicecommenthistoryQuery
$this->requireVirtualTable('hosts'); || $this instanceof ServicedowntimestarthistoryQuery
$leftcol = 'h.host_object_id'; || $this instanceof ServiceflappingstarthistoryQuery
|| $this instanceof ServicegroupQuery
|| $this instanceof ServicenotificationQuery
|| $this instanceof ServicestatehistoryQuery
|| $this instanceof ServicestatusQuery
) {
$this->requireVirtualTable('services');
$leftcol = 's.host_object_id';
} else {
$leftcol = 'ho.object_id';
if (! $this->hasJoinedTable('ho')) {
$this->requireVirtualTable('hosts');
}
}
} else { // $type === 'service'
$leftcol = 'so.object_id';
if (! $this->hasJoinedTable('so')) {
$this->requireVirtualTable('services');
}
} }
$mapped = $this->getMappedField($leftcol); $mapped = $this->getMappedField($leftcol);