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-3450-Error-informe-dinámico-al-marcar-una-gráfica-por-cada-agente' into 'develop' 

Fixed auto combined graph in metaconsole

See merge request artica/pandorafms!2146

Former-commit-id: c25a50e5176dcb2996df04ebcee3907cc444b56e
This commit is contained in:
Daniel Rodriguez 2019-01-29 19:14:15 +01:00
parent 11456bcfbb cc27f0451a
commit edd96e75ab
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/include/functions_reporting.php
View File

@ -6389,7 +6389,7 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
$graphs = db_get_all_rows_field_filter ("tgraph", "id_graph", $content['id_gs']); $graphs = db_get_all_rows_field_filter ("tgraph", "id_graph", $content['id_gs']);
$id_graph = $content['id_gs']; $id_graph = $content['id_gs'];
} }
else if($type_report == "automatic_graph"){ else if($type_report == "automatic_graph") {
$graphs[0]["stacked"] = ''; $graphs[0]["stacked"] = '';
$graphs[0]["summatory_series"] = ''; $graphs[0]["summatory_series"] = '';
$graphs[0]["average_series"] = ''; $graphs[0]["average_series"] = '';
@ -6397,15 +6397,14 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
$graphs[0]["fullscale"] = $content['style']['fullscale']; $graphs[0]["fullscale"] = $content['style']['fullscale'];
$modules = $content['id_agent_module']; $modules = $content['id_agent_module'];
if(!$modules){ if (is_metaconsole()) {
$module_source = db_get_all_rows_sql( $module_source = db_get_all_rows_sql(
"SELECT id_agent_module, id_server "SELECT id_agent_module, id_server
FROM tgraph_source FROM tgraph_source
WHERE id_graph = " . WHERE id_graph = " .
$content['id_gs'] $content['id_gs']);
);
if(isset($module_source) && is_array($module_source)){ if(isset($module_source) && is_array($module_source)) {
$modules = array(); $modules = array();
foreach ($module_source as $key => $value) { foreach ($module_source as $key => $value) {
$modules[$key]['module'] = $value['id_agent_module']; $modules[$key]['module'] = $value['id_agent_module'];