From d943fa5b781f13c8e2b7bb5d5fd9dad85a98d9b9 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 25 May 2015 12:46:32 +0200 Subject: [PATCH] Fixed the 'alert_report_agent', 'alert_report_group' and 'alert_report_module' item in metaconsole reports. TICKET: #2249 --- .../reporting_builder.item_editor.php | 3 +- .../include/functions_reporting.php | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 09659d6b02..d2c47ab3f4 100644 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -550,7 +550,7 @@ else html_print_select(reports_get_report_types(false, true), 'type', $type, 'chooseType();', '', ''); } else { - $report_type = reports_get_report_types($type); + $report_type = reports_get_report_types(); if (!empty($report_type) and isset($report_type[$type]['name'])) echo $report_type[$type]['name']; else @@ -2312,6 +2312,7 @@ function chooseType() { $("#row_period").show(); $("#row_show_in_two_columns").show(); $("#row_group").show(); + $("#row_servers").show(); break; case 'alert_report_agent': $("#row_description").show(); diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index b871de38eb..17887f5252 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -2412,6 +2412,14 @@ function reporting_alert_report_group($report, $content) { $content['name'] = __('Alert Report Group'); } + 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); $return['title'] = $content['name']; @@ -2514,6 +2522,10 @@ function reporting_alert_report_group($report, $content) { $return['data'] = $data; + if ($config['metaconsole']) { + metaconsole_restore_db(); + } + return reporting_check_structure_content($return); } @@ -2527,6 +2539,15 @@ function reporting_alert_report_agent($report, $content) { $content['name'] = __('Alert Report Agent'); } + if ($config['metaconsole']) { + $id_meta = metaconsole_get_id_server($content["server_name"]); + + + + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); + } + $agent_name = agents_get_name($content['id_agent']); $return['title'] = $content['name']; @@ -2609,6 +2630,10 @@ function reporting_alert_report_agent($report, $content) { $return['data'] = $data; + if ($config['metaconsole']) { + metaconsole_restore_db(); + } + return reporting_check_structure_content($return); } @@ -2622,6 +2647,14 @@ function reporting_alert_report_module($report, $content) { $content['name'] = __('Alert Report Module'); } + if ($config['metaconsole']) { + $id_meta = metaconsole_get_id_server($content["server_name"]); + + + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); + } + $module_name = io_safe_output( modules_get_agentmodule_name($content['id_agent_module'])); $agent_name = io_safe_output( @@ -2702,6 +2735,10 @@ function reporting_alert_report_module($report, $content) { $return['data'] = $data; + if ($config['metaconsole']) { + metaconsole_restore_db(); + } + return reporting_check_structure_content($return); }