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-4098-historical_data-report-no-definido-para-metaconsola' into 'develop' 

Fixed historical_data report in metaconsole

See merge request artica/pandorafms!2722
This commit is contained in:
Daniel Rodriguez 2019-10-04 13:53:29 +02:00
parent cc239e5e68 7bacb869f2
commit 915edd455d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/functions_reporting.php
View File

@ -3105,6 +3105,13 @@ function reporting_historical_data($report, $content)
$content['name'] = __('Historical data'); $content['name'] = __('Historical data');
} }
if (is_metaconsole()) {
$id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta);
$connection = metaconsole_connect($server);
}
$id_agent = agents_get_module_id( $id_agent = agents_get_module_id(
$content['id_agent_module'] $content['id_agent_module']
); );
@ -3196,6 +3203,10 @@ function reporting_historical_data($report, $content)
$return['data'] = $data; $return['data'] = $data;
if (is_metaconsole() && $connection > 0) {
metaconsole_restore_db();
}
return reporting_check_structure_content($return); return reporting_check_structure_content($return);
} }