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-11599-item-grouped-group-report-muestra-la-informacion-de-todos-los-nodos-en-metaconsola' into 'develop' 

Ent 11599 Item "Grouped group report" muestra la información de todos los nodos en metaconsola

See merge request artica/pandorafms!6126
This commit is contained in:
Rafael Ameijeiras 2023-06-26 07:50:29 +00:00
parent e3ef712e6f 08f8a124fe
commit d37c0f3d79
4 changed files with 23 additions and 11 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':
$("#row_group").show();
$("#row_servers").show();
$("#row_servers_all_opt").show();
$("#row_description").show();
$("#row_historical_db_check").hide();
break;

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

@ -1925,6 +1925,11 @@ switch ($action) {
$good_format = true;
break;
case 'group_report':
$values['server_name'] = get_parameter('combo_server');
$good_format = true;
break;
default:
$values['period'] = get_parameter('period');
$values['top_n'] = get_parameter(
@ -2778,6 +2783,11 @@ switch ($action) {
$good_format = true;
break;
case 'group_report':
$values['server_name'] = get_parameter('combo_server');
$good_format = true;
break;
default:
$values['period'] = get_parameter('period');
$values['top_n'] = get_parameter(
@ -2798,7 +2808,7 @@ switch ($action) {
break;
}
if ($values['server_name'] == '') {
if ($values['server_name'] == '' || $values['server_name'] === null) {
$values['server_name'] = get_parameter(
'combo_server'
);

19
pandora_console/include/functions_agents.php
View File

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

1
pandora_console/include/functions_reporting.php
View File

@ -4198,6 +4198,7 @@ function reporting_group_report($report, $content)
if (is_metaconsole() === true) {
if (isset($content['server_name']) === true
&& empty($content['server_name']) === false
&& $content['server_name'] !== 'all'
) {
$id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta);