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

#11599 fixed grouped reports in meteaconsole

This commit is contained in:
Daniel Cebrian 2023-06-16 10:23:37 +02:00
parent d0998432df
commit 9e6130ddfb
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -6988,7 +6988,7 @@ function chooseType() {
case 'group_report': case 'group_report':
$("#row_group").show(); $("#row_group").show();
$("#row_servers").show(); $("#row_servers_all_opt").show();
$("#row_description").show(); $("#row_description").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;

11
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1925,6 +1925,11 @@ switch ($action) {
$good_format = true; $good_format = true;
break; break;
case 'group_report':
$values['server_name'] = get_parameter('combo_server');
$good_format = true;
break;
default: default:
$values['period'] = get_parameter('period'); $values['period'] = get_parameter('period');
$values['top_n'] = get_parameter( $values['top_n'] = get_parameter(
@ -2798,7 +2803,7 @@ switch ($action) {
break; break;
} }
if ($values['server_name'] == '') { if ($values['server_name'] == '' || $values['server_name'] === null) {
$values['server_name'] = get_parameter( $values['server_name'] = get_parameter(
'combo_server' 'combo_server'
); );
@ -3226,6 +3231,10 @@ switch ($action) {
$es['agent_not_assigned_to_ip'] = get_parameter('agent_not_assigned_to_ip'); $es['agent_not_assigned_to_ip'] = get_parameter('agent_not_assigned_to_ip');
break; break;
case 'group_report':
$values['server_name'] = get_parameter('combo_server');
break;
case 'top_n': case 'top_n':
case 'general': case 'general':
case 'exception': case 'exception':

19
pandora_console/include/functions_agents.php
View File

@ -801,15 +801,16 @@ function agents_get_agents_selected($group)
0, 0,
true true
); );
if ($all !== false) {
$all = array_reduce( $all = array_reduce(
$all, $all,
function ($carry, $item) { function ($carry, $item) {
$carry[$item['id_tmetaconsole_setup'].'|'.$item['id_tagente']] = $item['server_name'].' » '.$item['alias']; $carry[$item['id_tmetaconsole_setup'].'|'.$item['id_tagente']] = $item['server_name'].' » '.$item['alias'];
return $carry; return $carry;
}, },
[] []
); );
}
} else { } else {
$all = agents_get_agents( $all = agents_get_agents(
['id_grupo' => $group], ['id_grupo' => $group],

5
pandora_console/include/functions_reporting.php
View File

@ -4198,6 +4198,7 @@ function reporting_group_report($report, $content)
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
if (isset($content['server_name']) === true if (isset($content['server_name']) === true
&& empty($content['server_name']) === false && empty($content['server_name']) === false
&& $content['server_name'] !== 'all'
) { ) {
$id_meta = metaconsole_get_id_server($content['server_name']); $id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta); $server = metaconsole_get_connection_by_id($id_meta);
@ -4253,7 +4254,9 @@ function reporting_group_report($report, $content)
$data_node = reporting_groups_nodes($content); $data_node = reporting_groups_nodes($content);
$count_events += $data_node['count_events']; $count_events += $data_node['count_events'];
foreach ($data_node['group_stats'] as $key => $value) { foreach ($data_node['group_stats'] as $key => $value) {
$group_stats[$key] += $value; if (array_key_exists($key, $group_stats)) {
$group_stats[$key] += $value;
}
} }
if (is_metaconsole() === true) { if (is_metaconsole() === true) {