From a33573226775908b174740f78e6c90bcc6485102 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 19 Dec 2017 13:13:42 +0100 Subject: [PATCH] fixed errors in graphs webproc and keep alive --- pandora_console/include/functions.php | 2 ++ pandora_console/include/functions_graph.php | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 104b201a29..1aee87943a 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1461,6 +1461,8 @@ function return_graphtype ($id_module_type) { case 21: case 18: case 9: + case 31: + case 100: return "boolean"; break; case 24: diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 43786a544c..f2cdf81fb0 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -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, - $series_type, $agent_module_id, $datelimit, $date, - $events = false, $show_events = false, - $show_unknown = false, $show_alerts = false, - $series_suffix = '', $percentil = false, - $flash_chart = true, $boolean_graph = false){ + $series_type, $agent_module_id, $datelimit, $date, + $events = false, $show_events = false, + $show_unknown = false, $show_alerts = false, + $series_suffix = '', $percentil = false, + $flash_chart = true, $boolean_graph = false){ global $config; 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_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; if($show_unknown) {