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

2014-05-21 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* include/functions_graph.php: Fix unknown graphs in graphs
	with only negative values. Now the unknown graph is always positive
	Ticket: #569 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9979 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2014-05-21 14:04:27 +00:00
parent 090ef2a96a
commit 264155530b
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2014-05-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fix unknown graphs in graphs
with only negative values. Now the unknown graph is always positive
Ticket: #569
2014-05-22 Vanessa Gil <vanessa.gil@artica.es> 2014-05-22 Vanessa Gil <vanessa.gil@artica.es>
* godmode/servers/manage_recontask.php * godmode/servers/manage_recontask.php

18
pandora_console/include/functions_graph.php
View File

@ -237,8 +237,10 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
global $chart_extra_data; global $chart_extra_data;
global $series_type; global $series_type;
global $max_value; global $max_value;
global $min_value;
$max_value = 0; $max_value = 0;
$min_value = null;
$flash_chart = $config['flash_charts']; $flash_chart = $config['flash_charts'];
// Event iterator // Event iterator
@ -281,6 +283,10 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
$max_value = $interval_max; $max_value = $interval_max;
} }
if ($min_value > $interval_max || $min_value == null) {
$min_value = $interval_max;
}
// Data in the interval // Data in the interval
if ($count > 0) { if ($count > 0) {
$total /= $count; $total /= $count;
@ -473,6 +479,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
global $critical_min; global $critical_min;
global $graphic_type; global $graphic_type;
global $max_value; global $max_value;
global $min_value;
$chart = array(); $chart = array();
@ -626,7 +633,16 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$graph_stats = get_statwin_graph_statistics($chart, $series_suffix); $graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
// Fix event and alert scale // Fix event and alert scale
$event_max = 2 + (float)$max_value * 1.05; if ($max_value > 0) {
$event_max = 2 + (float)$max_value * 1.05;
}
else {
$event_max = abs(($max_value+$min_value)/2);
if ($event_max < 5) {
$event_max = 5;
}
}
foreach ($chart as $timestamp => $chart_data) { foreach ($chart as $timestamp => $chart_data) {
if ($show_events && $chart_data['event'.$series_suffix] > 0) { if ($show_events && $chart_data['event'.$series_suffix] > 0) {
$chart[$timestamp]['event'.$series_suffix] = $event_max * 1.2; $chart[$timestamp]['event'.$series_suffix] = $event_max * 1.2;