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

Merge branch '3056-Error-en-templates-wizard-de-informes-en-meta-dev' into 'develop' 

Fixed Automatic combined Graph in metaconsole

See merge request artica/pandorafms!2021
This commit is contained in:
vgilc 2018-11-30 13:05:30 +01:00
parent 48c83430ec 590cef50f4
commit ed615a11d0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_reporting.php
View File

@ -6353,7 +6353,17 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
} }
} }
else{ else{
if ($content['id_agent_module']) {
$modules[] = $content['id_agent_module']; $modules[] = $content['id_agent_module'];
} else {
// restore to metaconsole database
metaconsole_restore_db();
$module_source = db_get_all_rows_sql("SELECT id_agent_module FROM tgraph_source WHERE id_graph = " . $content['id_gs']);
foreach ($module_source as $key => $value) {
$modules[$key] = $value['id_agent_module'];
}
metaconsole_connect($server);
}
} }
$id_graph = 0; $id_graph = 0;
} }
@ -6408,7 +6418,7 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
break; break;
} }
if ($config['metaconsole'] && $type_report != 'automatic_graph') { if ($config['metaconsole']) {
metaconsole_restore_db(); metaconsole_restore_db();
} }