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

OverriddenVarsResolver: deal with root templates

Browse Source 
fixes #2333
This commit is contained in:
Thomas Gelf 2021-05-28 10:36:31 +02:00
parent 2cff396fe4
commit ec87cd0ec2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/82-Changelog.md
View File

@ -26,6 +26,7 @@ next (will be 1.9.0)
* FIX: allow switching DB config while connection is failing (#2300) * FIX: allow switching DB config while connection is failing (#2300)
* FIX: show Override button when all Fields belong to Field Categories (#2303) * FIX: show Override button when all Fields belong to Field Categories (#2303)
* FIX: show Services applied with Rules involving applied Hostgroups (#2313) * FIX: show Services applied with Rules involving applied Hostgroups (#2313)
* FIX: Overrides for Services belonging to Sets on root Host Templates (#2333)
* FEATURE: show "deprecated" flag on object attribute inspection (#2312) * FEATURE: show "deprecated" flag on object attribute inspection (#2312)
* FEATURE: Service Template for single Host services provides auto-completion (#1974) * FEATURE: Service Template for single Host services provides auto-completion (#1974)

5
library/Director/Resolver/OverriddenVarsResolver.php
View File

@ -22,7 +22,11 @@ class OverriddenVarsResolver
public function fetchForHost(IcingaHost $host) public function fetchForHost(IcingaHost $host)
{ {
$overrides = [];
$parents = $host->listFlatResolvedImportNames(); $parents = $host->listFlatResolvedImportNames();
if (empty($parents)) {
return $overrides;
}
$query = $this->db->select() $query = $this->db->select()
->from(['hv' => 'icinga_host_var'], [ ->from(['hv' => 'icinga_host_var'], [
'host_name' => 'h.object_name', 'host_name' => 'h.object_name',
@ -36,7 +40,6 @@ class OverriddenVarsResolver
->where('hv.varname = ?', $this->overrideVarName) ->where('hv.varname = ?', $this->overrideVarName)
->where('h.object_name IN (?)', $parents); ->where('h.object_name IN (?)', $parents);
$overrides = [];
foreach ($this->db->fetchAll($query) as $row) { foreach ($this->db->fetchAll($query) as $row) {
if ($row->varvalue === null) { if ($row->varvalue === null) {
continue; continue;