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

2013-02-04 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_graph.php: re-enabled the baseline for the
	reports.
	
	Fixes: #3599961




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7573 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-04 14:47:08 +00:00
parent 56c806ada7
commit e179fc44f5
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-02-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: re-enabled the baseline for the
reports.
Fixes: #3599961
2013-02-04 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.item_editor.php: fixed the

9
pandora_console/include/functions_graph.php
View File

@ -589,9 +589,8 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
}
// Get baseline data
//Baseline was replaced by compare graph feature
$baseline_data = array();
/*if ($baseline) {
if ($baseline) {
$baseline_data = array ();
if ($baseline == 1) {
$baseline_data = enterprise_hook ('reporting_enterprise_get_baseline', array ($agent_module_id, $period, $width, $height , $title, $unit_name, $date));
@ -599,9 +598,9 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$baseline_data = array ();
}
}
}*/
}
if (empty($unit)){
if (empty($unit)) {
$unit = modules_get_unit($agent_module_id);
}
@ -708,7 +707,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
global $critical_min;
$series_suffix_str = '';
if($compare !== false) {
if ($compare !== false) {
$series_suffix = '2';
$series_suffix_str = ' ('.__('Previous').')';
// Build the data of the previous period