Fix service inheritance with overrides on multiple nested levels

Prevent host services from losing configuration from parent imports when overriding service values.
Icinga · Nov 25, 2024 · 204a61f · 204a61f
1 parent 4032d49
commit 204a61f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/library/Director/CustomVariable/CustomVariables.php b/library/Director/CustomVariable/CustomVariables.php
@@ -399,10 +399,9 @@ public function toLegacyConfigString()
     protected function renderSingleVar($key, $var, $renderExpressions = false)
     {
         if ($key === $this->overrideKeyName) {
-            return c::renderKeyOperatorValue(
+            return c::renderKeyValue(
                 $this->renderKeyName($key),
-                '+=',
-                $var->toConfigStringPrefetchable($renderExpressions)
+                'directorMergeOverrideConfig('.$this->renderKeyName($key) . ', ' . $var->toConfigStringPrefetchable($renderExpressions).')'
             );
         } else {
             return c::renderKeyValue(

diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php
@@ -553,6 +553,20 @@ protected function renderHostOverridableVars()
       )
     }
   }
+  globals.directorMergeOverrideConfig = function(existing,overrides) {
+    if (existing) {
+      for (service => conf in overrides) {
+        if (existing[service]) {
+          existing[service] += conf
+        } else {
+          existing[service] = conf
+        }
+      }
+      return existing
+    } else {
+      return overrides
+    }
+  }
 
   template Service DirectorOverrideTemplate {
     /**