From ec87cd0ec26a3f6d746425ab1a93f8f499e1a543 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 28 May 2021 10:36:31 +0200 Subject: [PATCH] OverriddenVarsResolver: deal with root templates fixes #2333 --- doc/82-Changelog.md | 1 + library/Director/Resolver/OverriddenVarsResolver.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md index 9ae107ee..79468999 100644 --- a/doc/82-Changelog.md +++ b/doc/82-Changelog.md @@ -26,6 +26,7 @@ next (will be 1.9.0) * FIX: allow switching DB config while connection is failing (#2300) * FIX: show Override button when all Fields belong to Field Categories (#2303) * 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: Service Template for single Host services provides auto-completion (#1974) diff --git a/library/Director/Resolver/OverriddenVarsResolver.php b/library/Director/Resolver/OverriddenVarsResolver.php index 3c8a71c1..4541244c 100644 --- a/library/Director/Resolver/OverriddenVarsResolver.php +++ b/library/Director/Resolver/OverriddenVarsResolver.php @@ -22,7 +22,11 @@ class OverriddenVarsResolver public function fetchForHost(IcingaHost $host) { + $overrides = []; $parents = $host->listFlatResolvedImportNames(); + if (empty($parents)) { + return $overrides; + } $query = $this->db->select() ->from(['hv' => 'icinga_host_var'], [ 'host_name' => 'h.object_name', @@ -36,7 +40,6 @@ class OverriddenVarsResolver ->where('hv.varname = ?', $this->overrideVarName) ->where('h.object_name IN (?)', $parents); - $overrides = []; foreach ($this->db->fetchAll($query) as $row) { if ($row->varvalue === null) { continue;