diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 540ab4e9b7..ea6cbb4ac8 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -499,6 +499,8 @@ function reporting_SLA($report, $content, $type = 'dinamic', $return['failed'] = __('There are no SLAs defined'); } else { + require_once ($config['homedir'] . '/include/functions_planned_downtimes.php'); + $metaconsole_on = is_metaconsole(); // checking if needed to show graph or table if ($content['show_graph'] == 0 || $content['show_graph'] == 1){ @@ -596,12 +598,12 @@ function reporting_SLA($report, $content, $type = 'dinamic', $slice ); - /* + if ($metaconsole_on) { //Restore db connection metaconsole_restore_db(); } - + $server_name = $sla ['server_name']; //Metaconsole connection if ($metaconsole_on && $server_name != '') { @@ -610,8 +612,6 @@ function reporting_SLA($report, $content, $type = 'dinamic', continue; } } - */ - //$total_SLA += $sla_value; if ($show_graphs) { $planned_downtimes = reporting_get_planned_downtimes_intervals($sla['id_agent_module'], $report['datetime'] - $content['period'], $report['datetime']); @@ -779,12 +779,12 @@ function reporting_SLA($report, $content, $type = 'dinamic', $return['charts'][] = $dataslice; } - /* + if ($metaconsole_on) { //Restore db connection metaconsole_restore_db(); } - */ + } // SLA items sorted descending () @@ -4403,7 +4403,7 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $i++; } } - $t_day+=SECONDS_1DAY; + $t_day = strtotime(" + 1 days", $t_day); } // End while -> build matrix } // End else (prepare fixed matrix) } // Finished: Build exceptions @@ -4430,12 +4430,12 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $global_datetime_from = $datetime_from; $global_datetime_to = $datetime_to; $range = ($datetime_to - $datetime_from) / $slices; - + // Analysis begins for ($count=0; $count < $slices; $count++) { - - $datetime_from = $global_datetime_from + ($count*$range); - $datetime_to = $global_datetime_from + (($count+1)*$range); + // use strtotime based on local timezone to avoid datetime conversions + $datetime_from = strtotime(" + " . ($count*$range) . " seconds" , $global_datetime_from); + $datetime_to = strtotime(" + " . (($count + 1)*$range) . " seconds", $global_datetime_from); $return = array(); // timing @@ -4637,11 +4637,10 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = function reporting_availability($report, $content, $date=false, $time=false) { global $config; - + $return = array(); $return['type'] = 'availability'; $return['subtype'] = $content['group_by_agent']; - $return['resume'] = $content['show_resume']; if (empty($content['name'])) { $content['name'] = __('Availability'); @@ -4862,6 +4861,7 @@ function reporting_availability($report, $content, $date=false, $time=false) { $return["data"] = $data; $return["resume"] = array(); + $return['resume']['resume'] = $content['show_resume']; $return["resume"]['min_text'] = $min_text; $return["resume"]['min'] = $min; $return["resume"]['avg'] = $avg; diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 7829e8bb2b..3cf711abe2 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -2104,7 +2104,7 @@ function reporting_html_availability(&$table, $item) { array_push ($table->data, $data); array_push ($table->data, $data2); - if ($item['resume'] && !empty($item["data"])) { + if ($item['resume']['resume'] && !empty($item["data"])) { $table1->width = '99%'; $table1->data = array ();