From bb0950ec03da95cc048af544bb1f140ba6f2b4ba Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Thu, 17 Nov 2016 09:12:12 +0100 Subject: [PATCH] Added new graph to "no data" values in monitors graph. Ticket #4202 --- pandora_console/include/functions_graph.php | 22 ++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 9803e08478..f747f2e9f4 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -434,6 +434,20 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i } } } + + if ($uncompressed_module || ($timestamp > time ())) { + if (!isset($chart[$timestamp]['no_data'.$series_suffix])) { + $chart[$timestamp]['no_data'.$series_suffix] = 0; + } + if ($chart[$timestamp]['sum'.$series_suffix] == $last_known) { + $chart[$timestamp]['no_data'.$series_suffix] = 0; + $series_type['no_data'.$series_suffix] = 'area'; + } + else { + $chart[$timestamp]['no_data'.$series_suffix] = $last_known; + $series_type['no_data'.$series_suffix] = 'area'; + } + } if ($show_unknown) { if (!isset($chart[$timestamp]['unknown'.$series_suffix])) { @@ -705,6 +719,9 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, array('border' => '#ff7f00', 'color' => '#ff7f00', 'alpha' => CHART_DEFAULT_ALPHA); } + $color['no_data'.$series_suffix] = array( + 'border' => '#000000', 'color' => '#f2c40e', + 'alpha' => CHART_DEFAULT_ALPHA); if ($show_unknown) { $color['unknown' . $series_suffix] = array('border' => '#999999', 'color' => '#999999', @@ -749,7 +766,10 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, /*if ($baseline) { $legend['baseline'.$series_suffix] = __('Baseline'); }*/ - + + $legend['no_data'.$series_suffix] = __('No data').$series_suffix_str; + $chart_extra_data['legend_no_data'] = $legend['no_data'.$series_suffix_str]; + if ($show_unknown) { $legend['unknown'.$series_suffix] = __('Unknown').$series_suffix_str; $chart_extra_data['legend_unknown'] = $legend['unknown'.$series_suffix_str];