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> 2013-02-04 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.item_editor.php: fixed the * godmode/reporting/reporting_builder.item_editor.php: fixed the

25
pandora_console/include/functions_graph.php
View File

@ -450,11 +450,11 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$width, $height , $title = '', $unit_name = null, $width, $height , $title = '', $unit_name = null,
$show_alerts = false, $avg_only = 0, $date = 0, $unit = '', $show_alerts = false, $avg_only = 0, $date = 0, $unit = '',
$baseline = 0, $return_data = 0, $show_title = true, $projection = false, $baseline = 0, $return_data = 0, $show_title = true, $projection = false,
$adapt_key = '', $compare = false, $series_suffix = '', $series_suffix_str = '', $adapt_key = '', $compare = false, $series_suffix = '', $series_suffix_str = '',
$show_unknown = false) { $show_unknown = false) {
global $config; global $config;
global $chart; global $chart;
@ -589,9 +589,8 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
} }
// Get baseline data // Get baseline data
//Baseline was replaced by compare graph feature
$baseline_data = array(); $baseline_data = array();
/*if ($baseline) { if ($baseline) {
$baseline_data = array (); $baseline_data = array ();
if ($baseline == 1) { if ($baseline == 1) {
$baseline_data = enterprise_hook ('reporting_enterprise_get_baseline', array ($agent_module_id, $period, $width, $height , $title, $unit_name, $date)); $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 (); $baseline_data = array ();
} }
} }
}*/ }
if (empty($unit)){ if (empty($unit)) {
$unit = modules_get_unit($agent_module_id); $unit = modules_get_unit($agent_module_id);
} }
@ -708,18 +707,18 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
global $critical_min; global $critical_min;
$series_suffix_str = ''; $series_suffix_str = '';
if($compare !== false) { if ($compare !== false) {
$series_suffix = '2'; $series_suffix = '2';
$series_suffix_str = ' ('.__('Previous').')'; $series_suffix_str = ' ('.__('Previous').')';
// Build the data of the previous period // Build the data of the previous period
grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$width, $height, $title, $unit_name, $width, $height, $title, $unit_name,
$show_alerts, $avg_only, $show_alerts, $avg_only,
$date-$period, $unit, $baseline, $return_data, $show_title, $date-$period, $unit, $baseline, $return_data, $show_title,
$projection, $adapt_key, $compare, $projection, $adapt_key, $compare,
$series_suffix, $series_suffix_str, $show_unknown); $series_suffix, $series_suffix_str, $show_unknown);
switch($compare) { switch($compare) {
case 'separated': case 'separated':
// Store the chart calculated // Store the chart calculated
@ -744,7 +743,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$show_alerts, $avg_only, $show_alerts, $avg_only,
$date, $unit, $baseline, $return_data, $show_title, $date, $unit, $baseline, $return_data, $show_title,
$projection, $adapt_key, $compare, '', '', $show_unknown); $projection, $adapt_key, $compare, '', '', $show_unknown);
if ($return_data) { if ($return_data) {
return $data_returned; return $data_returned;
} }