tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4661-leyenda-de-las-graficas-en-classic-mode' into 'develop'

Browse Source 
Fixed Error

See merge request artica/pandorafms!2767
This commit is contained in:
Daniel Rodriguez 2019-10-07 19:21:28 +02:00
commit e6724752ff
1 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pandora_console/include/functions_graph.php
View File

@ -295,20 +295,40 @@ function grafico_modulo_sparse_data(
return false; return false;
} }
$array_data['sum'.$series_suffix]['agent_module_id'] = $agent_module_id; $array_data = series_suffix_leyend(
$array_data['sum'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type']; 'sum',
$array_data['sum'.$series_suffix]['agent_name'] = $data_module_graph['agent_name']; $series_suffix,
$array_data['sum'.$series_suffix]['module_name'] = $data_module_graph['module_name']; $agent_module_id,
$array_data['sum'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias']; $data_module_graph,
$array_data['sum'.$series_suffix]['unit'] = $data_module_graph['unit']; $array_data
);
if ($params['percentil']) { if ($params['percentil']) {
$array_data['percentil'.$series_suffix]['agent_module_id'] = $agent_module_id; $array_data = series_suffix_leyend(
$array_data['percentil'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type']; 'percentil',
$array_data['percentil'.$series_suffix]['agent_name'] = $data_module_graph['agent_name']; $series_suffix,
$array_data['percentil'.$series_suffix]['module_name'] = $data_module_graph['module_name']; $agent_module_id,
$array_data['percentil'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias']; $data_module_graph,
$array_data['percentil'.$series_suffix]['unit'] = $data_module_graph['unit']; $array_data
);
}
if ($params['type_mode_graph']) {
$array_data = series_suffix_leyend(
'min',
$series_suffix,
$agent_module_id,
$data_module_graph,
$array_data
);
$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 // This is for a specific type of report that consists in passing
@ -3169,6 +3189,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) function graph_events_validated($width=300, $height=200, $extra_filters=[], $meta=false, $history=false)
{ {
global $config; global $config;