WIP2

Author: raviks789

library/Icingadb/Hook/CustomVarEnricherHook.php

@@ -22,19 +22,20 @@ abstract class CustomVarEnricherHook
     abstract public function getGroups(): array;
 
     /**
-     * Return a group name for the given variable name
+     * Return enriched vars in the following format
+     * [label => enriched custom var]
      *
      * @param array $vars
      *
      * @return array
      */
-    abstract public function enrichCustomVars(array $vars, Model $object): array;
+    abstract public function enrichCustomVars(array &$vars, Model $object): array;
 
     public static function prepareEnrichedCustomVars(array $vars, Model $object): array
     {
         $enrichedVars = [];
-
         $groups = [];
+
         foreach (Hook::all('Icingadb/CustomVarEnricher') as $hook) {
             /** @var self $hook */
             try {
@@ -45,26 +46,8 @@ public static function prepareEnrichedCustomVars(array $vars, Model $object): ar
             }
         }
 
-        $enrichedVars = array_merge([], ...$enrichedVars);
+        $vars = array_merge($vars, ...$enrichedVars);
         $groups = array_merge([], ...$groups);
-        foreach ($vars as $key => $var) {
-            if (array_key_exists($key, $enrichedVars)) {
-                $label = key($enrichedVars[$key]);
-                $vars[$label] = $enrichedVars[$key][$label];
-
-                unset($vars[$key]);
-
-                $key = $label;
-            }
-
-            foreach ($groups as $group) {
-                if (array_key_exists($key, $group)) {
-                    unset($vars[$key]);
-
-                    break;
-                }
-            }
-        }
 
         return [$vars, $groups];
     }

library/Icingadb/ProvidedHook/Icingadb/CustomVarEnricher.php

@@ -20,31 +20,11 @@ class CustomVarEnricher extends CustomVarEnricherHook
 {
     protected $fieldConfig;
 
-    protected $datalistMaps;
+    protected $datalistMaps = [];
 
     protected $groups = [];
 
-    public function prefetchForObject(Model $object): bool
-    {
-        return false;
-    }
-
-    public function renderCustomVarKey(string $key)
-    {
-        return $key;
-    }
-
-    public function renderCustomVarValue(string $key, $value)
-    {
-        return $value;
-    }
-
-    public function identifyCustomVarGroup(string $key): ?string
-    {
-        return null;
-    }
-
-    public function enrichCustomVars(array $vars, Model $object): array
+    public function enrichCustomVars(array &$vars, Model $object): array
     {
         $directorObject = null;
         $connection =  Db::fromResourceName(Config::module('director')->get('db', 'resource'));
@@ -62,12 +42,21 @@ public function enrichCustomVars(array $vars, Model $object): array
         $this->fieldConfig = (new IcingaObjectFieldLoader($directorObject))->getFields();
 
         $this->buildDataListMap($connection);
+
         if ($directorObject) {
-            foreach ($vars as $varName => $customVar) {
-                $newVars[$varName] = $this->resolveCustomVarMapping($varName, $customVar, $connection);
+            $varsToReplace = json_decode(json_encode($directorObject->getVars()), true)
+                + json_decode(json_encode($directorObject->getInheritedVars()), true);
+
+
+            foreach ($varsToReplace as $varName => $customVar) {
+                if (isset($vars[$varName])) {
+                    $newVars[] = $this->resolveCustomVarMapping($varName, $customVar, $connection);
+
+                    unset($vars[$varName]);
+                }
             }
-        } else {
-            $newVars = $vars;
+
+            $newVars = array_merge([], ...$newVars);
         }
 
         return $newVars;
@@ -128,6 +117,8 @@ protected function resolveCustomVarMapping(string $name, $val, DbConnection $con
                 } else {
                     $this->groups[$field->getCategoryName()][$name] = $val;
                 }
+
+                return [];
             }
         } elseif (is_array($val)) {
             $newValue = [];