WIP4

Icinga · Aug 27, 2024 · 00254f1 · 00254f1
1 parent 4ca6fd7
commit 00254f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/library/Icingadb/Hook/CustomVarEnricherHook.php b/library/Icingadb/Hook/CustomVarEnricherHook.php
@@ -14,13 +14,6 @@ abstract class CustomVarEnricherHook
 {
     use HookUtils;
 
-    /**
-     * Return the grouped custom vars
-     *
-     * @return array
-     */
-    abstract public function getGroups(): array;
-
     /**
      * Return enriched vars in the following format
      * [label => enriched custom var]
@@ -39,8 +32,9 @@ public static function prepareEnrichedCustomVars(array $vars, Model $object): ar
         foreach (Hook::all('Icingadb/CustomVarEnricher') as $hook) {
             /** @var self $hook */
             try {
-                $enrichedVars[] = $hook->enrichCustomVars($vars, $object);
-                $groups[] = $hook->getGroups();
+                list($hookVars, $hookGroups) = $hook->enrichCustomVars($vars, $object);
+                $enrichedVars[] = $hookVars;
+                $groups[] = $hookGroups;
             } catch (Throwable $e) {
                 Logger::error('Failed to load hook %s:', get_class($hook), $e);
             }

diff --git a/library/Icingadb/ProvidedHook/Icingadb/CustomVarEnricher.php b/library/Icingadb/ProvidedHook/Icingadb/CustomVarEnricher.php
@@ -58,7 +58,7 @@ public function enrichCustomVars(array &$vars, Model $object): array
             $newVars = array_merge([], ...$newVars);
         }
 
-        return $newVars;
+        return [$newVars, $this->groups];
     }
 
     /**
@@ -159,9 +159,4 @@ private function buildDataListMap(DbConnection $db)
             }
         }
     }
-
-    public function getGroups(): array
-    {
-        return $this->groups;
-    }
 }