Skip to content

Commit 276781c

Browse files
committed
Add CustomVarsRetrieverHook for dynamic custom variable retrieval, updated ObjectSuggestions and Controller classes to utilize the new hook for enhanced search functionality
1 parent fa23e86 commit 276781c

File tree

3 files changed

+46
-2
lines changed

3 files changed

+46
-2
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
namespace Icinga\Module\Icingadb\Hook;
4+
5+
use Icinga\Application\Hook;
6+
use Icinga\Application\Logger;
7+
use ipl\Orm\Model;
8+
use Throwable;
9+
10+
abstract class CustomVarsRetrieverHook
11+
{
12+
abstract public function retrieveCustomVars(Model $model): array;
13+
14+
final public static function getCustomVarColumns(Model $model): array
15+
{
16+
$columns = [];
17+
18+
$hooks = Hook::all('icingadb/CustomVarsRetriever');
19+
foreach ($hooks as $hook) {
20+
try {
21+
$customVars = $hook->retrieveCustomVars($model);
22+
if (!empty($customVars)) {
23+
$columns = [...$columns, ...$customVars];
24+
}
25+
} catch (Throwable $e) {
26+
Logger::error(
27+
'Error retrieving Custom Vars for %s with table name "%s": %s',
28+
get_class($model),
29+
$model->getTableName(),
30+
$e->getMessage()
31+
);
32+
}
33+
}
34+
35+
return $columns;
36+
}
37+
}

library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Generator;
88
use Icinga\Module\Icingadb\Common\Auth;
99
use Icinga\Module\Icingadb\Common\Database;
10+
use Icinga\Module\Icingadb\Hook\CustomVarsRetrieverHook;
1011
use Icinga\Module\Icingadb\Model\Behavior\ReRoute;
1112
use Icinga\Module\Icingadb\Model\CustomvarFlat;
1213
use Icinga\Module\Icingadb\Model\Host;
@@ -132,7 +133,10 @@ protected function createQuickSearchFilter($searchTerm)
132133
$resolver = $model::on($this->getDb())->getResolver();
133134

134135
$quickFilter = Filter::any();
135-
foreach ($model->getSearchColumns() as $column) {
136+
$customVarColumns = CustomVarsRetrieverHook::getCustomVarColumns($model);
137+
$columns = [...$model->getSearchColumns(), ...$customVarColumns];
138+
139+
foreach ($columns as $column) {
136140
if (strpos($column, '.') === false) {
137141
$column = $resolver->qualifyColumn($column, $model->getTableName());
138142
}

library/Icingadb/Web/Controller.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Icinga\Module\Icingadb\Common\SearchControls;
2323
use Icinga\Module\Icingadb\Data\CsvResultSet;
2424
use Icinga\Module\Icingadb\Data\JsonResultSet;
25+
use Icinga\Module\Icingadb\Hook\CustomVarsRetrieverHook;
2526
use Icinga\Module\Icingadb\Web\Control\GridViewModeSwitcher;
2627
use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
2728
use Icinga\Module\Icingadb\Widget\ItemTable\StateItemTable;
@@ -303,7 +304,9 @@ public function handleSearchRequest(Query $query, array $additionalColumns = [])
303304
*/
304305
protected function prepareSearchFilter(Query $query, string $search, Filter\Any $filter, array $additionalColumns)
305306
{
306-
$columns = array_merge($query->getModel()->getSearchColumns(), $additionalColumns);
307+
$model = $query->getModel();
308+
$customVarColumns = CustomVarsRetrieverHook::getCustomVarColumns($model);
309+
$columns = array_merge($model->getSearchColumns(), $additionalColumns, $customVarColumns);
307310
foreach ($columns as $column) {
308311
if (strpos($column, '.') === false) {
309312
$column = $query->getResolver()->qualifyColumn($column, $query->getModel()->getTableName());

0 commit comments

Comments
 (0)