tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8723-13221-giss-optimizacion-en-el-despliegue-del-tree-view-de-servicios' into 'develop' 

allow disable counters on mc environments

See merge request artica/pandorafms!4814
This commit is contained in:
Daniel Rodriguez 2022-06-02 09:08:08 +00:00
parent 8fcdb59ae8 8a221f10b0
commit 1aefe527c4
2 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
pandora_console/include/class/TreeService.class.php
View File

@ -530,33 +530,6 @@ class TreeService extends Tree
$tmp['elementDescription'] = $item->description(); $tmp['elementDescription'] = $item->description();
$tmp['disabled'] = $item->service()->disabled(); $tmp['disabled'] = $item->service()->disabled();
if ($this->connectedToNode === false
&& is_metaconsole() === true
&& $tmp['metaID'] > 0
) {
// Impersonate node.
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_hook(
'metaconsole_connect',
[
null,
$tmp['metaID'],
]
);
}
if (check_acl($config['id_user'], $item->service()->id_group(), 'AR')) {
$grandchildren = $item->service()->children();
}
if ($this->connectedToNode === false
&& is_metaconsole() === true
&& $tmp['metaID'] > 0
) {
// Restore connection.
\enterprise_hook('metaconsole_restore_db');
}
$counters = [ $counters = [
'total_modules' => 0, 'total_modules' => 0,
'total_agents' => 0, 'total_agents' => 0,
@ -565,29 +538,66 @@ class TreeService extends Tree
'total' => 0, 'total' => 0,
]; ];
if (is_array($grandchildren) === true) { if (is_metaconsole() === false
$counters = array_reduce( || (isset($config['realtimestats']) === true
$grandchildren, && $config['realtimestats'] === true
function ($carry, $item) { && $tmp['metaID'] > 0)
if ($item->type() === SERVICE_ELEMENT_MODULE) { ) {
$carry['total_modules']++; // Look for counters.
} else if ($item->type() === SERVICE_ELEMENT_AGENT) { if ($this->connectedToNode === false
$carry['total_agents']++; && is_metaconsole() === true
} else if ($item->type() === SERVICE_ELEMENT_SERVICE) { && $tmp['metaID'] > 0
$carry['total_services']++; ) {
} else if ($item->type() === SERVICE_ELEMENT_DYNAMIC) { // Impersonate node.
$carry['total_dynamic']++; \enterprise_include_once('include/functions_metaconsole.php');
} \enterprise_hook(
'metaconsole_connect',
[
null,
$tmp['metaID'],
]
);
}
$carry['total']++; if (check_acl($config['id_user'], $item->service()->id_group(), 'AR')) {
$grandchildren = $item->service()->children();
}
return $carry; if ($this->connectedToNode === false
}, && is_metaconsole() === true
$counters && $tmp['metaID'] > 0
); ) {
} // Restore connection.
\enterprise_hook('metaconsole_restore_db');
}
if ($counters['total'] > 0) { if (is_array($grandchildren) === true) {
$counters = array_reduce(
$grandchildren,
function ($carry, $item) {
if ($item->type() === SERVICE_ELEMENT_MODULE) {
$carry['total_modules']++;
} else if ($item->type() === SERVICE_ELEMENT_AGENT) {
$carry['total_agents']++;
} else if ($item->type() === SERVICE_ELEMENT_SERVICE) {
$carry['total_services']++;
} else if ($item->type() === SERVICE_ELEMENT_DYNAMIC) {
$carry['total_dynamic']++;
}
$carry['total']++;
return $carry;
},
$counters
);
}
if ($counters['total'] > 0) {
$tmp['searchChildren'] = 1;
}
} else {
// Always search for.
$tmp['searchChildren'] = 1; $tmp['searchChildren'] = 1;
} }

4
pandora_console/include/functions_config.php
View File

@ -2096,6 +2096,10 @@ function config_process_config()
config_update_value('metaconsole_events_history', 0); config_update_value('metaconsole_events_history', 0);
} }
if (!isset($config['realtimestats'])) {
config_update_value('realtimestats', 1);
}
if (!isset($config['trap_purge'])) { if (!isset($config['trap_purge'])) {
config_update_value('trap_purge', 7); config_update_value('trap_purge', 7);
} }