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

Fixed auto combined graph in metaconsole 2 

Former-commit-id: 672531931421175354f2a877ac295c1763107756
This commit is contained in:
Daniel Maya 2019-01-29 17:12:24 +01:00
parent e03b62d168
commit cc27f0451a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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,13 +6397,12 @@ 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 || !is_array($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();