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

Merge branch '1632-Pandora_FMS_charts_3' into 'develop'

Browse Source 
fixed errors in graphs webproc and keep alive

See merge request artica/pandorafms!1198
This commit is contained in:
vgilc 2017-12-19 15:47:03 +01:00
commit 7033746c49
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions.php
View File

@ -1461,6 +1461,8 @@ function return_graphtype ($id_module_type) {
case 21: case 21:
case 18: case 18:
case 9: case 9:
case 31:
case 100:
return "boolean"; return "boolean";
break; break;
case 24: case 24:

14
pandora_console/include/functions_graph.php
View File

@ -4550,11 +4550,11 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
} }
function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index, function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
$series_type, $agent_module_id, $datelimit, $date, $series_type, $agent_module_id, $datelimit, $date,
$events = false, $show_events = false, $events = false, $show_events = false,
$show_unknown = false, $show_alerts = false, $show_unknown = false, $show_alerts = false,
$series_suffix = '', $percentil = false, $series_suffix = '', $percentil = false,
$flash_chart = true, $boolean_graph = false){ $flash_chart = true, $boolean_graph = false){
global $config; global $config;
global $max_value; global $max_value;
@ -4610,6 +4610,10 @@ function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
$chart_data[$event_date]["alert" . $series_suffix] = 1; $chart_data[$event_date]["alert" . $series_suffix] = 1;
$chart_extra_data[count($chart_data)-1]['alerts'] = implode (',', $alert_ids[$event_date]); $chart_extra_data[count($chart_data)-1]['alerts'] = implode (',', $alert_ids[$event_date]);
} }
else{
$chart_data[$event_date]["event" . $series_suffix] = NULL;
$chart_data[$event_date]["alert" . $series_suffix] = NULL;
}
$chart_data[$event_date]["sum" . $series_suffix] = $previous_data; $chart_data[$event_date]["sum" . $series_suffix] = $previous_data;
if($show_unknown) { if($show_unknown) {