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

sla fixed errors 

(cherry picked from commit 39f4690ef4)
This commit is contained in:
daniel 2016-11-28 19:25:32 +01:00
parent 9fc797ae9e
commit 8c47a51e66
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pandora_console/include/functions_reporting.php
View File

@ -507,6 +507,8 @@ function reporting_SLA($report, $content, $type = 'dinamic',
$return['failed'] = __('There are no SLAs defined'); $return['failed'] = __('There are no SLAs defined');
} }
else { else {
require_once ($config['homedir'] . '/include/functions_planned_downtimes.php');
$metaconsole_on = is_metaconsole();
// checking if needed to show graph or table // checking if needed to show graph or table
if ($content['show_graph'] == 0 || $content['show_graph'] == 1){ if ($content['show_graph'] == 0 || $content['show_graph'] == 1){
@ -604,12 +606,12 @@ function reporting_SLA($report, $content, $type = 'dinamic',
$slice $slice
); );
/*
if ($metaconsole_on) { if ($metaconsole_on) {
//Restore db connection //Restore db connection
metaconsole_restore_db(); metaconsole_restore_db();
} }
$server_name = $sla ['server_name']; $server_name = $sla ['server_name'];
//Metaconsole connection //Metaconsole connection
if ($metaconsole_on && $server_name != '') { if ($metaconsole_on && $server_name != '') {
@ -618,8 +620,6 @@ function reporting_SLA($report, $content, $type = 'dinamic',
continue; continue;
} }
} }
*/
//$total_SLA += $sla_value;
if ($show_graphs) { if ($show_graphs) {
$planned_downtimes = reporting_get_planned_downtimes_intervals($sla['id_agent_module'], $report['datetime'] - $content['period'], $report['datetime']); $planned_downtimes = reporting_get_planned_downtimes_intervals($sla['id_agent_module'], $report['datetime'] - $content['period'], $report['datetime']);
@ -787,12 +787,12 @@ function reporting_SLA($report, $content, $type = 'dinamic',
$return['charts'][] = $dataslice; $return['charts'][] = $dataslice;
} }
/*
if ($metaconsole_on) { if ($metaconsole_on) {
//Restore db connection //Restore db connection
metaconsole_restore_db(); metaconsole_restore_db();
} }
*/
} }
// SLA items sorted descending () // SLA items sorted descending ()
@ -4400,7 +4400,7 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to =
$i++; $i++;
} }
} }
$t_day+=SECONDS_1DAY; $t_day = strtotime(" + 1 days", $t_day);
} // End while -> build matrix } // End while -> build matrix
} // End else (prepare fixed matrix) } // End else (prepare fixed matrix)
} // Finished: Build exceptions } // Finished: Build exceptions
@ -4427,12 +4427,12 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to =
$global_datetime_from = $datetime_from; $global_datetime_from = $datetime_from;
$global_datetime_to = $datetime_to; $global_datetime_to = $datetime_to;
$range = ($datetime_to - $datetime_from) / $slices; $range = ($datetime_to - $datetime_from) / $slices;
// Analysis begins // Analysis begins
for ($count=0; $count < $slices; $count++) { for ($count=0; $count < $slices; $count++) {
// use strtotime based on local timezone to avoid datetime conversions
$datetime_from = $global_datetime_from + ($count*$range); $datetime_from = strtotime(" + " . ($count*$range) . " seconds" , $global_datetime_from);
$datetime_to = $global_datetime_from + (($count+1)*$range); $datetime_to = strtotime(" + " . (($count + 1)*$range) . " seconds", $global_datetime_from);
$return = array(); $return = array();
// timing // timing
@ -4634,11 +4634,10 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to =
function reporting_availability($report, $content, $date=false, $time=false) { function reporting_availability($report, $content, $date=false, $time=false) {
global $config; global $config;
$return = array(); $return = array();
$return['type'] = 'availability'; $return['type'] = 'availability';
$return['subtype'] = $content['group_by_agent']; $return['subtype'] = $content['group_by_agent'];
$return['resume'] = $content['show_resume'];
if (empty($content['name'])) { if (empty($content['name'])) {
$content['name'] = __('Availability'); $content['name'] = __('Availability');
@ -4859,6 +4858,7 @@ function reporting_availability($report, $content, $date=false, $time=false) {
$return["data"] = $data; $return["data"] = $data;
$return["resume"] = array(); $return["resume"] = array();
$return['resume']['resume'] = $content['show_resume'];
$return["resume"]['min_text'] = $min_text; $return["resume"]['min_text'] = $min_text;
$return["resume"]['min'] = $min; $return["resume"]['min'] = $min;
$return["resume"]['avg'] = $avg; $return["resume"]['avg'] = $avg;

2
pandora_console/include/functions_reporting_html.php
View File

@ -2102,7 +2102,7 @@ function reporting_html_availability(&$table, $item) {
array_push ($table->data, $data); array_push ($table->data, $data);
array_push ($table->data, $data2); array_push ($table->data, $data2);
if ($item['resume'] && !empty($item["data"])) { if ($item['resume']['resume'] && !empty($item["data"])) {
$table1->width = '99%'; $table1->width = '99%';
$table1->data = array (); $table1->data = array ();