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

fixed minor error

This commit is contained in:
marcos.alconada 2019-09-27 12:07:40 +02:00
parent cc18d5d1ed
commit 4c93ca3d60
1 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pandora_console/include/functions_graph.php
View File

@ -295,36 +295,40 @@ function grafico_modulo_sparse_data(
return false;
}
$array_data['sum'.$series_suffix]['agent_module_id'] = $agent_module_id;
$array_data['sum'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
$array_data['sum'.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
$array_data['sum'.$series_suffix]['module_name'] = $data_module_graph['module_name'];
$array_data['sum'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
$array_data['sum'.$series_suffix]['unit'] = $data_module_graph['unit'];
$array_data = series_suffix_leyend(
'sum',
$series_suffix,
$agent_module_id,
$data_module_graph,
$array_data
);
if ($params['percentil']) {
$array_data['percentil'.$series_suffix]['agent_module_id'] = $agent_module_id;
$array_data['percentil'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
$array_data['percentil'.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
$array_data['percentil'.$series_suffix]['module_name'] = $data_module_graph['module_name'];
$array_data['percentil'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
$array_data['percentil'.$series_suffix]['unit'] = $data_module_graph['unit'];
$array_data = series_suffix_leyend(
'percentil',
$series_suffix,
$agent_module_id,
$data_module_graph,
$array_data
);
}
if ($params['type_mode_graph']) {
$array_data['min'.$series_suffix]['agent_module_id'] = $agent_module_id;
$array_data['min'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
$array_data['min'.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
$array_data['min'.$series_suffix]['module_name'] = $data_module_graph['module_name'];
$array_data['min'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
$array_data['min'.$series_suffix]['unit'] = $data_module_graph['unit'];
$array_data = series_suffix_leyend(
'min',
$series_suffix,
$agent_module_id,
$data_module_graph,
$array_data
);
$array_data['max'.$series_suffix]['agent_module_id'] = $agent_module_id;
$array_data['max'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
$array_data['max'.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
$array_data['max'.$series_suffix]['module_name'] = $data_module_graph['module_name'];
$array_data['max'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
$array_data['max'.$series_suffix]['unit'] = $data_module_graph['unit'];
$array_data = series_suffix_leyend(
'max',
$series_suffix,
$agent_module_id,
$data_module_graph,
$array_data
);
}
// This is for a specific type of report that consists in passing
@ -3208,6 +3212,21 @@ function graphic_incident_source($width=320, $height=200)
}
function series_suffix_leyend($series_name, $series_suffix, $id_agent, $data_module_graph, $array_data)
{
global $config;
$array_data[$series_name.$series_suffix]['agent_module_id'] = $id_agent;
$array_data[$series_name.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
$array_data[$series_name.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
$array_data[$series_name.$series_suffix]['module_name'] = $data_module_graph['module_name'];
$array_data[$series_name.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
$array_data[$series_name.$series_suffix]['unit'] = $data_module_graph['unit'];
return $array_data;
}
function graph_events_validated($width=300, $height=200, $extra_filters=[], $meta=false, $history=false)
{
global $config;