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

2010-08-23 Sergio Martin <sergio.martin@artica.es> 

* include/functions_reporting.php
	include/fgraph.php: Fixed the max and min values 
	on the graphs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3168 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-08-23 10:46:11 +00:00
parent 1b7b389e7f
commit ba03b4ecc0
3 changed files with 9 additions and 7 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 @@
2010-08-23 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php
include/fgraph.php: Fixed the max and min values
on the graphs
2010-08-23 Junichi Satoh <junichi@rworks.jp>
* godmode/alert/alert_list.php, godmode/alert/alert_list.list.php:

4
pandora_console/include/fgraph.php
View File

@ -1474,7 +1474,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
}
// Flash chart
$caption = __('Max. Value') . ': ' . $min_value . ' ' . __('Avg. Value') . ': ' . $avg_value . ' ' . __('Min. Value') . ': ' . $min_value;
$caption = __('Max. Value') . ': ' . $max_value . ' ' . __('Avg. Value') . ': ' . $avg_value . ' ' . __('Min. Value') . ': ' . $min_value;
if (! $graphic_type) {
return fs_module_chart ($chart, $width, $height, $avg_only, $resolution / 10, $time_format, $show_events, $show_alerts, $caption);
}
@ -1936,7 +1936,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
}
// Flash chart
$caption = __('Max. Value') . ': ' . $min_value . ' ' . __('Avg. Value') . ': ' . $avg_value . ' ' . __('Min. Value') . ': ' . $min_value;
$caption = __('Max. Value') . ': ' . $max_value . ' ' . __('Avg. Value') . ': ' . $avg_value . ' ' . __('Min. Value') . ': ' . $min_value;
if (! $graphic_type) {
return fs_module_chart ($chart, $width, $height, $avg_only, $resolution / 10, $time_format, $show_events, $show_alerts, $caption);
}

6
pandora_console/include/functions_reporting.php
View File

@ -254,11 +254,7 @@ function get_agentmodule_data_min ($id_agent_module, $period, $date = 0) {
}
// Set initial conditions
if ($uncompressed_module || $interval_data[0]['utimestamp'] == $datelimit) {
$min = $interval_data[0]['datos'];
} else {
$min = 0;
}
$min = $interval_data[0]['datos'];
foreach ($interval_data as $data) {
if ($data['datos'] < $min) {