tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-12-05 Sergio Martin <sergio.martin@artica.es> 

* include/functions_graph.php: Fix a statistics bug on
	compared graphs merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7228 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-12-05 11:41:52 +00:00
parent 800ffa9ccf
commit 26a9477ef3
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-05 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fix a statistics bug on
compared graphs merged from 4.0.x
2012-12-04 Sergio Martin <sergio.martin@artica.es>
* extensions/dbmanager.php

31
pandora_console/include/functions_graph.php
View File

@ -84,7 +84,7 @@ function get_graph_statistics ($chart_array) {
return $stats;
}
function get_statwin_graph_statistics ($chart_array) {
function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
/// IMPORTANT!
///
@ -104,6 +104,12 @@ function get_statwin_graph_statistics ($chart_array) {
$stats['max'] = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
foreach ($chart_array as $item) {
if($series_suffix != '') {
$item['sum'] = $item['sum'.$series_suffix];
$item['min'] = $item['min'.$series_suffix];
$item['max'] = $item['max'.$series_suffix];
}
//Get stats for normal grap
if (isset($item['sum']) && $item['sum']) {
//Sum all values later divide by the number of elements
@ -118,11 +124,10 @@ function get_statwin_graph_statistics ($chart_array) {
//Get maximum
if ($stats['sum']['max'] == null) {
$stats['sum']['max'] = $item['sum'];
} else if ($item['sum'] > $stats['sum']['max']) {
$stats['sum']['max'] = $item['sum'];
}
$stats['sum']['max'] = $item['sum'];
} else if ($item['sum'] > $stats['sum']['max']) {
$stats['sum']['max'] = $item['sum'];
}
}
//Get stats for min graph
@ -602,7 +607,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
return $chart;
}
$graph_stats = get_statwin_graph_statistics($chart);
$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
// Fix event and alert scale
$event_max = 2 + (float)$max_value * 1.05;
@ -2451,14 +2456,14 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
else {
$chart[$timestamp]['sum'.$series_suffix] = $total;
$chart[$timestamp + 1] = array ('sum' => 0,
$chart[$timestamp + 1] = array ('sum'.$series_suffix => 0,
//'count' => 0,
//'timestamp_bottom' => $timestamp,
//'timestamp_top' => $timestamp + $interval,
'min' => 0,
'max' => 0,
'event' => $event_value,
'alert' => $alert_value);
'min'.$series_suffix => 0,
'max'.$series_suffix => 0,
'event'.$series_suffix => $event_value,
'alert'.$series_suffix => $alert_value);
}
$previous_data = 0;
}
@ -2495,7 +2500,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
// Get min, max and avg (less efficient but centralized for all modules and reports)
$graph_stats = get_statwin_graph_statistics($chart);
$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
// Fix event and alert scale
foreach ($chart as $timestamp => $chart_data) {