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

Fixed the 'group_configuration' and 'agent_configuration' items in metaconsole reports. TICKET: #2249

This commit is contained in:
mdtrooper 2015-05-25 13:39:27 +02:00
parent 81a0a217b5
commit 22ce2d8902
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/godmode/reporting/reporting_builder.item_editor.php Normal file → Executable file
View File

@ -2470,6 +2470,7 @@ function chooseType() {
break; break;
case 'group_configuration': case 'group_configuration':
$("#row_group").show(); $("#row_group").show();
$("#row_servers").show();
break; break;
case 'netflow_area': case 'netflow_area':
$("#row_netflow_filter").show(); $("#row_netflow_filter").show();

23
pandora_console/include/functions_reporting.php
View File

@ -2307,6 +2307,14 @@ function reporting_group_configuration($report, $content) {
$content['name'] = __('Group configuration'); $content['name'] = __('Group configuration');
} }
if ($config['metaconsole']) {
$id_meta = metaconsole_get_id_server($content["server_name"]);
$server = metaconsole_get_connection_by_id ($id_meta);
metaconsole_connect($server);
}
$group_name = groups_get_name($content['id_group'], true); $group_name = groups_get_name($content['id_group'], true);
$return['title'] = $content['name']; $return['title'] = $content['name'];
@ -2336,6 +2344,10 @@ function reporting_group_configuration($report, $content) {
$return['data'][] = $agent_report['data']; $return['data'][] = $agent_report['data'];
} }
if ($config['metaconsole']) {
metaconsole_restore_db();
}
return reporting_check_structure_content($return); return reporting_check_structure_content($return);
} }
@ -3172,6 +3184,13 @@ function reporting_agent_configuration($report, $content) {
$return["description"] = $content["description"]; $return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content); $return["date"] = reporting_get_date_text($report, $content);
if ($config['metaconsole']) {
$id_meta = metaconsole_get_id_server($content["server_name"]);
$server = metaconsole_get_connection_by_id ($id_meta);
metaconsole_connect($server);
}
$sql = " $sql = "
SELECT * SELECT *
@ -3264,6 +3283,10 @@ function reporting_agent_configuration($report, $content) {
$return['data'] = $agent_configuration; $return['data'] = $agent_configuration;
if ($config['metaconsole']) {
metaconsole_restore_db();
}
return reporting_check_structure_content($return); return reporting_check_structure_content($return);
} }