tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for agent_module widget

Browse Source
This commit is contained in:
fbsanchez 2021-06-23 18:00:54 +02:00
parent 76fbf75572
commit 36e455e5c5
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pandora_console/include/lib/Dashboard/Widgets/agent_module.php
View File

@ -35,6 +35,7 @@ use PandoraFMS\Module;
*/ */
class AgentModuleWidget extends Widget class AgentModuleWidget extends Widget
{ {
const MODULE_SEPARATOR = '|-|-|-|';
/** /**
* Name widget. * Name widget.
@ -308,12 +309,17 @@ class AgentModuleWidget extends Widget
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
$values['mModules'] = implode( $values['mModules'] = implode(
',', self::MODULE_SEPARATOR,
array_reduce( array_reduce(
$values['mModules'], $values['mModules'],
function ($carry, $item) { function ($carry, $item) {
$d = explode('|', $item); $d = explode('|', $item);
$carry[] = $d[1]; if (isset($d[1]) === true) {
$carry[] = $d[1];
} else {
$carry[] = $item;
}
return $carry; return $carry;
}, },
[] []
@ -630,10 +636,20 @@ class AgentModuleWidget extends Widget
} }
// Extract info all modules selected. // Extract info all modules selected.
$target_modules = explode(',', $this->values['mModules']); $target_modules = explode(
$all_modules = Module::search( self::MODULE_SEPARATOR,
['id_agente_modulo' => $target_modules] $this->values['mModules']
); );
if (is_metaconsole() === true
&& $this->values['mShowCommonModules'] === '0'
) {
$all_modules = $target_modules;
} else {
$all_modules = Module::search(
['id_agente_modulo' => $target_modules]
);
}
if ($all_modules !== null) { if ($all_modules !== null) {
$reduceAllModules = array_reduce( $reduceAllModules = array_reduce(
$all_modules, $all_modules,
@ -642,7 +658,12 @@ class AgentModuleWidget extends Widget
return $carry; return $carry;
} }
$carry[$item->name()] = null; if (is_object($item) === true) {
$carry[$item->name()] = null;
} else {
$carry[$item] = null;
}
return $carry; return $carry;
} }
); );
@ -675,9 +696,17 @@ class AgentModuleWidget extends Widget
$visualData[$agent_id]['agent_name'] = $agent->name(); $visualData[$agent_id]['agent_name'] = $agent->name();
$visualData[$agent_id]['agent_alias'] = $agent->alias(); $visualData[$agent_id]['agent_alias'] = $agent->alias();
$modules = $agent->searchModules( if (is_metaconsole() === true
['id_agente_modulo' => $target_modules] && $this->values['mShowCommonModules'] === '1'
); ) {
$modules = $agent->searchModules(
['id_agente_modulo' => $target_modules]
);
} else {
$modules = $agent->searchModules(
['nombre' => array_keys($reduceAllModules)]
);
}
$visualData[$agent_id]['modules'] = $reduceAllModules; $visualData[$agent_id]['modules'] = $reduceAllModules;
foreach ($modules as $module) { foreach ($modules as $module) {

3
pandora_console/operation/agentes/ver_agente.php
View File

@ -263,12 +263,11 @@ if (is_ajax()) {
} }
$modules = []; $modules = [];
$i = 1;
foreach ($final_modules as $module_name => $occurrences) { foreach ($final_modules as $module_name => $occurrences) {
if ($occurrences === $nodes_consulted) { if ($occurrences === $nodes_consulted) {
// Module already present in ALL nodes. // Module already present in ALL nodes.
$modules[] = [ $modules[] = [
'id_agente_modulo' => ($i++), 'id_agente_modulo' => $module_name,
'nombre' => $module_name, 'nombre' => $module_name,
]; ];
} }