diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index f24f0bae51..1bc9c6b362 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2294,7 +2294,9 @@ function graph_sla_slicebar ($id, $period, $sla_min, $sla_max, $date, $daysWeek 2 => COL_WARNING, 3 => COL_CRITICAL, 4 => COL_UNKNOWN, - 5 => $col_planned_downtime); + 5 => "#ff8400",//COL_MINOR, + 6 => COL_NOTINIT, + 7 => "#ddd");//COL_MAJOR); return slicesbar_graph($data, $period, $width, $height, $colors, $config['fontpath'], $round_corner, $home_url, $ttl); diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index ef7e34b385..b4a8c7226b 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -467,7 +467,7 @@ function reporting_SLA($report, $content, $type = 'dinamic', $force_width_chart = null, $force_height_chart = null) { global $config; - + $return = array(); $return['type'] = 'SLA'; if (empty($content['name'])) { @@ -478,7 +478,6 @@ function reporting_SLA($report, $content, $type = 'dinamic', $return["description"] = $content["description"]; $return["date"] = reporting_get_date_text($report, $content); - // Get chart reporting_set_conf_charts($width, $height, $only_image, $type, $content, $ttl); @@ -508,207 +507,108 @@ function reporting_SLA($report, $content, $type = 'dinamic', $return['failed'] = __('There are no SLAs defined'); } else { - - // What show? - $show_table = $content['show_graph'] == 0 || $content['show_graph'] == 1; - $show_graphs = $content['show_graph'] == 1 || $content['show_graph'] == 2; - - - // Table Planned Downtimes - require_once ($config['homedir'] . '/include/functions_planned_downtimes.php'); - $metaconsole_on = is_metaconsole(); - $downtime_malformed = false; - - $planned_downtimes_empty = true; - $malformed_planned_downtimes_empty = true; - - $return['planned_downtimes'] = array(); - - if ($metaconsole_on) { - $id_agent_modules_by_server = array(); - - foreach ($slas as $sla) { - $server = $sla['server_name']; - if (empty($server)) - continue; - - if (!isset($id_agent_modules_by_server[$server])) - $id_agent_modules_by_server[$server] = array(); - - $id_agent_modules_by_server[$server][] = $sla['id_agent_module']; - } - - $planned_downtimes_by_server = array(); - $malformed_planned_downtimes_by_server = array(); - foreach ($id_agent_modules_by_server as $server => $id_agent_modules) { - //Metaconsole connection - if (!empty($server)) { - $connection = metaconsole_get_connection($server); - if (!metaconsole_load_external_db($connection)) { - continue; - } - - $planned_downtimes_by_server[$server] = reporting_get_planned_downtimes(($report['datetime']-$content['period']), $report['datetime'], $id_agent_modules); - $malformed_planned_downtimes_by_server[$server] = planned_downtimes_get_malformed(); - - if (!empty($planned_downtimes_by_server[$server])) - $planned_downtimes_empty = false; - if (!empty($malformed_planned_downtimes_by_server[$server])) - $malformed_planned_downtimes_empty = false; - - //Restore db connection - metaconsole_restore_db(); - } - } - - if (!$planned_downtimes_empty) { - foreach ($planned_downtimes_by_server as $server => $planned_downtimes) { - foreach ($planned_downtimes as $planned_downtime) { - $data = array(); - $data['server'] = $server; - $data['name'] = $planned_downtime['name']; - $data['description'] = $planned_downtime['description']; - $data['execution'] = ucfirst($planned_downtime['type_execution']); - $data['dates'] = reporting_format_planned_downtime_dates($planned_downtime); - - $data['malformed'] = 0; - if (!$malformed_planned_downtimes_empty - && isset($malformed_planned_downtimes_by_server[$server]) - && isset($malformed_planned_downtimes_by_server[$server][$planned_downtime['id']])) { - - $data['malformed'] = 1; - - if (!$downtime_malformed) - $downtime_malformed = true; - } - - $return['planned_downtimes'][] = $data; - } - } - } + + // checking if needed to show graph or table + if ($content['show_graph'] == 0 || $content['show_graph'] == 1){ + $show_table = 1; } - else { - $id_agent_modules = array(); - foreach ($slas as $sla) { - if (!empty($sla['id_agent_module'])) - $id_agent_modules[] = $sla['id_agent_module']; - } - - $planned_downtimes = - reporting_get_planned_downtimes( - ($report['datetime'] - $content['period']), - $report['datetime'], - $id_agent_modules); - $malformed_planned_downtimes = planned_downtimes_get_malformed(); - - if (!empty($planned_downtimes)) - $planned_downtimes_empty = false; - if (!empty($malformed_planned_downtimes)) - $malformed_planned_downtimes_empty = false; - - if (!$planned_downtimes_empty) { - foreach ($planned_downtimes as $planned_downtime) { - - $data = array(); - $data['name'] = $planned_downtime['name']; - $data['description'] = $planned_downtime['description']; - $data['execution'] = ucfirst($planned_downtime['type_execution']); - $data['dates'] = - reporting_format_planned_downtime_dates($planned_downtime); - - $data['malformed'] = 0; - if (!$malformed_planned_downtimes_empty && isset($malformed_planned_downtimes[$planned_downtime['id']])) { - $data['malformed'] = 1; - if (!$downtime_malformed) - $downtime_malformed = true; - } - - $return['planned_downtimes'][] = $data; - } - } + else{ + $show_table = 0; } - if ($downtime_malformed) { - $return['failed'] = - __('This item is affected by a malformed planned downtime. Go to the planned downtimes section to solve this.'); + if($content['show_graph'] == 1 || $content['show_graph'] == 2){ + $show_graphs = 1; } - else { - - - $urlImage = ui_get_full_url(false, true, false, false); - - $sla_failed = false; - $total_SLA = 0; - $total_result_SLA = 'ok'; - $sla_showed = array(); - $sla_showed_values = array(); - - foreach ($slas as $sla) { - $server_name = $sla ['server_name']; - //Metaconsole connection - if ($metaconsole_on && $server_name != '') { - $connection = metaconsole_get_connection($server_name); - if (!metaconsole_load_external_db($connection)) { - //ui_print_error_message ("Error connecting to ".$server_name); - continue; - } - } - - if (modules_is_disable_agent($sla['id_agent_module']) - || modules_is_not_init($sla['id_agent_module'])) { - if ($metaconsole_on) { - //Restore db connection - metaconsole_restore_db(); - } - + else{ + $show_graphs = 0; + } + + $urlImage = ui_get_full_url(false, true, false, false); + + + $sla_failed = false; + $total_SLA = 0; + $total_result_SLA = 'ok'; + $sla_showed = array(); + $sla_showed_values = array(); + + foreach ($slas as $sla) { + $server_name = $sla ['server_name']; + //Metaconsole connection + if ($metaconsole_on && $server_name != '') { + $connection = metaconsole_get_connection($server_name); + if (!metaconsole_load_external_db($connection)) { + //ui_print_error_message ("Error connecting to ".$server_name); continue; } - - - - //Get the sla_value in % and store it on $sla_value - $sla_value = reporting_get_agentmodule_sla( - $sla['id_agent_module'], - $content['period'], - $sla['sla_min'], - $sla['sla_max'], - $report["datetime"], - $content, - $content['time_from'], - $content['time_to']); - + } + + if (modules_is_disable_agent($sla['id_agent_module']) + || modules_is_not_init($sla['id_agent_module'])) { if ($metaconsole_on) { //Restore db connection metaconsole_restore_db(); } - //Do not show right modules if 'only_display_wrong' is active - if ($content['only_display_wrong'] == 1 && - $sla_value >= $sla['sla_limit']) { - - continue; - } - - $sla_showed[] = $sla; - $sla_showed_values[] = $sla_value; - + continue; } - // SLA items sorted descending () - if ($content['top_n'] == 2) { - arsort($sla_showed_values); + //controller min and max == 0 then dinamic min and max critical + $dinamic_text = 0; + if($sla['sla_min'] == 0 && $sla['sla_max'] == 0){ + $sla['sla_min'] = null; + $sla['sla_max'] = null; + $dinamic_text = __('Dynamic'); } - // SLA items sorted ascending - else if ($content['top_n'] == 1) { - asort($sla_showed_values); + + //controller inverse interval + $inverse_interval = 0; + if( (isset($sla['sla_max'])) && (isset($sla['sla_min'])) ) { + if($sla['sla_max'] < $sla['sla_min']){ + $content_sla_max = $sla['sla_max']; + $sla['sla_max'] = $sla['sla_min']; + $sla['sla_min'] = $content_sla_max; + $inverse_interval = 1; + $dinamic_text = __('Inverse'); + } + } + + //for graph slice for module-interval, if not slice=0; + if($show_graphs){ + $module_interval = modules_get_interval ($sla['id_agent_module']); + $slice = $content["period"] / $module_interval; + } + else{ + $slice = 1; + } + + //call functions sla + $sla_array = array(); + $sla_array = reporting_advanced_sla( + $sla['id_agent_module'], + $report["datetime"] - $content['period'], + $report["datetime"], + $sla['sla_min'], // min_value -> dynamic + $sla['sla_max'], // max_value -> dynamic + $inverse_interval, // inverse_interval -> dynamic + array ( "1" => $content["sunday"], + "2" => $content["monday"], + "3" => $content["tuesday"], + "4" => $content["wednesday"], + "5" => $content["thursday"], + "6" => $content["friday"], + "7" => $content["saturday"] + ), + $content['time_from'], + $content['time_to'], + $slice + ); + + /* + if ($metaconsole_on) { + //Restore db connection + metaconsole_restore_db(); } - } - - $return['data'] = array(); - $return['charts'] = null; - - foreach ($sla_showed_values as $k => $sla_value) { - $sla = $sla_showed[$k]; $server_name = $sla ['server_name']; //Metaconsole connection @@ -718,74 +618,157 @@ 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']); + + if ( (is_array($planned_downtimes)) && (count($planned_downtimes) > 0)){ + // Sort retrieved planned downtimes + usort($planned_downtimes, function ($a, $b) { + $a = intval($a["date_from"]); + $b = intval($b["date_from"]); + if ($a==$b) { + return 0; + } + return ($a<$b)?-1:1; + }); - $total_SLA += $sla_value; - - if ($show_table) { - $data = array (); - $data['agent'] = modules_get_agentmodule_agent_name( - $sla['id_agent_module']); - $data['module'] = modules_get_agentmodule_name( - $sla['id_agent_module']); - - - switch ($config["dbtype"]) { - case "mysql": - case "postgresql": - $data['max'] = $sla['sla_max']; - $data['min'] = $sla['sla_min']; - $data['sla_limit'] = $sla['sla_limit']; - break; - case "oracle": - $data['max'] = oracle_format_float_to_php($sla['sla_max']); - $data['min'] = oracle_format_float_to_php($sla['sla_min']); - $data['sla_limit'] = oracle_format_float_to_php($sla['sla_limit']); - break; - } - - $data['sla_value_unknown'] = 0; - $data['sla_status'] = 0; - $data['sla_value'] = 0; - if ($sla_value === false) { - $data['sla_value_unknown'] = 1; + // Compress (overlapped) planned downtimes + $npd = count($planned_downtimes); + for ($i=0; $i<$npd; $i++) { + if (isset($planned_downtimes[$i+1])) { + if ($planned_downtimes[$i]["date_to"] >= $planned_downtimes[$i+1]["date_from"]) { + // merge + $planned_downtimes[$i]["date_to"] = $planned_downtimes[$i+1]["date_to"]; + array_splice ($planned_downtimes, $i+1, 1); + $npd--; + } + } + } } else { - - if ($sla_value >= $sla['sla_limit']) { - $data['sla_status'] = 1; + $planned_downtimes = null; + } + } + + $data = array(); + $data['agent'] = modules_get_agentmodule_agent_name($sla['id_agent_module']); + $data['module'] = modules_get_agentmodule_name($sla['id_agent_module']); + $data['max'] = $sla['sla_max']; + $data['min'] = $sla['sla_min']; + $data['sla_limit'] = $sla['sla_limit']; + $data['dinamic_text'] = $dinamic_text; + + if(isset($sla_array[0])){ + $data['time_total'] = 0; + $data['time_ok'] = 0; + $data['time_error'] = 0; + $data['time_unknown'] = 0; + $data['time_not_init'] = 0; + $data['time_downtime'] = 0; + $data['checks_total'] = 0; + $data['checks_ok'] = 0; + $data['checks_error'] = 0; + $data['checks_unknown'] = 0; + $data['checks_not_init'] = 0; + + $raw_graph = array(); + $i = 0; + foreach ($sla_array as $value_sla) { + $data['time_total'] += $value_sla['time_total']; + $data['time_ok'] += $value_sla['time_ok']; + $data['time_error'] += $value_sla['time_error']; + $data['time_unknown'] += $value_sla['time_unknown']; + $data['time_downtime'] += $value_sla['time_downtime']; + $data['time_not_init'] += $value_sla['time_not_init']; + $data['checks_total'] += $value_sla['checks_total']; + $data['checks_ok'] += $value_sla['checks_ok']; + $data['checks_error'] += $value_sla['checks_error']; + $data['checks_unknown'] += $value_sla['checks_unknown']; + $data['checks_not_init'] += $value_sla['checks_not_init']; + + // generate raw data for graph + if ($value_sla['time_total'] != 0) { + if ($value_sla['time_unknown'] == $value_sla['time_total']) { // UNKNOWN + $raw_graph[$i]['data'] = 4; + } + elseif ($value_sla['time_not_init'] == $value_sla['time_total']) { // NOT INIT + $raw_graph[$i]['data'] = 6; + } + elseif ($value_sla['SLA'] >= $sla['sla_limit']) { // OK + $raw_graph[$i]['data'] = 1; + } + elseif ($value_sla['SLA'] < $sla['sla_limit']) { // ERR + $raw_graph[$i]['data'] = 3; + } } else { - $sla_failed = true; - $data['sla_status'] = 0; + $raw_graph[$i]['data'] = 7; } - - // Print icon with status including edge - # Fix : 100% accurance is 'inside limits' although 10% was not overrun - // if (($sla_value == 100 && $sla_value >= $sla['sla_limit']) || ($sla_value > ($sla['sla_limit'] + $edge_interval))) { - // $data[6] = html_print_image('images/status_sets/default/severity_normal.png',true,array('title'=>__('Inside limits'))); - // } - // elseif (($sla_value <= $sla['sla_limit'] + $edge_interval) - // && ($sla_value >= $sla['sla_limit'] - $edge_interval)) { - // $data[6] = html_print_image('images/status_sets/default/severity_warning.png',true,array('title'=>__('On the edge'))); - // } - // else { - // $data[6] = html_print_image('images/status_sets/default/severity_critical.png',true,array('title'=>__('Out of limits'))); - // } - - $data['sla_value'] = $sla_value; - $data['sla_formated_value'] = format_numeric($sla_value, 2). "%"; + $raw_graph[$i]['utimestamp'] = $value_sla['date_to'] - $value_sla['date_from']; + + if (isset($planned_downtimes)) { + foreach($planned_downtimes as $pd){ + if( ($value_sla['date_from'] >= $pd['date_from']) + && ($value_sla['date_to'] <= $pd['date_to']) ) { + $raw_graph[$i]['data'] = 5; // in scheduled downtime + break; + } + } + } + $i++; } - - $return['data'][] = $data; + $data['sla_value'] = ($data['time_ok']/($data['time_ok']+$data['time_error']))*100; + $data['sla_fixed'] = sla_truncate($data['sla_value'], $config['graph_precision'] ); + } + else{ + //Show only table not divider in slice for defect slice=1 + $data['time_total'] = $sla_array['time_total']; + $data['time_ok'] = $sla_array['time_ok']; + $data['time_error'] = $sla_array['time_error']; + $data['time_unknown'] = $sla_array['time_unknown']; + $data['time_downtime'] = $sla_array['time_downtime']; + $data['time_not_init'] = $sla_array['time_not_init']; + $data['checks_total'] = $sla_array['checks_total']; + $data['checks_ok'] = $sla_array['checks_ok']; + $data['checks_error'] = $sla_array['checks_error']; + $data['checks_unknown'] = $sla_array['checks_unknown']; + $data['checks_not_init'] = $sla_array['checks_not_init']; + $data['sla_value'] = $sla_array['SLA']; } + //checks whether or not it meets the SLA + if ($data['sla_value'] >= $sla['sla_limit']) { + $data['sla_status'] = 1; + $sla_failed = false; + } + else { + $sla_failed = true; + $data['sla_status'] = 0; + } + + //Do not show right modules if 'only_display_wrong' is active + if($content['only_display_wrong'] && $sla_failed == false){ + continue; + } + + //find order + $data['order'] = $data['sla_value']; + + if($show_table) { + $return['data'][] = $data; + } // Slice graphs calculation if ($show_graphs) { $dataslice = array(); $dataslice['agent'] = modules_get_agentmodule_agent_name ($sla['id_agent_module']); $dataslice['module'] = modules_get_agentmodule_name ($sla['id_agent_module']); - + $dataslice['sla_value'] = $data['sla_value']; + $dataslice['order'] = $data['sla_value']; + $dataslice['chart'] = graph_sla_slicebar( $sla['id_agent_module'], $content['period'], @@ -795,23 +778,98 @@ function reporting_SLA($report, $content, $type = 'dinamic', $content, $content['time_from'], $content['time_to'], - 650, - 25, + 1920, + 50, $urlImage, $ttl, - false, + $raw_graph, false); $return['charts'][] = $dataslice; } - + /* if ($metaconsole_on) { //Restore db connection metaconsole_restore_db(); } + */ + } + + // SLA items sorted descending () + if ($content['top_n'] == 2) { + arsort($return['data']['']); + } + // SLA items sorted ascending + else if ($content['top_n'] == 1) { + asort($sla_showed_values); + } + + //order data for ascending or descending + if($content['top_n'] != 0){ + switch ($content['top_n']) { + case 1: + //order tables + $temp = array(); + foreach ($return['data'] as $row) { + $i = 0; + foreach ($temp as $t_row) { + if ($row['sla_value'] < $t_row['order']) { + break; + } + $i++; + } + array_splice($temp, $i, 0, array($row)); + } + $return['data'] = $temp; + + //order graphs + $temp = array(); + foreach ($return['charts'] as $row) { + $i = 0; + foreach ($temp as $t_row) { + if ($row['sla_value'] < $t_row['order']) { + break; + } + $i++; + } + array_splice($temp, $i, 0, array($row)); + } + $return['charts'] = $temp; + + break; + case 2: + //order tables + $temp = array(); + foreach ($return['data'] as $row) { + $i = 0; + foreach ($temp as $t_row) { + if ($row['sla_value'] > $t_row['order']) { + break; + } + $i++; + } + array_splice($temp, $i, 0, array($row)); + } + $return['data'] = $temp; + + //order graph + $temp = array(); + foreach ($return['charts'] as $row) { + $i = 0; + foreach ($temp as $t_row) { + if ($row['sla_value'] > $t_row['order']) { + break; + } + $i++; + } + array_splice($temp, $i, 0, array($row)); + } + $return['charts'] = $temp; + + break; + } } } - return reporting_check_structure_content($return); } @@ -3745,36 +3803,100 @@ function sla_truncate($num, $accurancy = 2){ // Returns if the data is in a valid range or not // function sla_check_value($value, $min, $max, $inverse_interval = 0) { - if ($max == $min) { // equal 0 + + if (!isset($inverse_interval)) { + $inverse_interval = 0; + } + if ( (!isset($max)) && (!isset($min)) ) { + return ($inverse_interval==0)?true:false; + } + if ($max == $min) { // equal if ($value == $max) { return ($inverse_interval==0)?true:false; } return ($inverse_interval==0)?false:true; } - if (!isset ($max)) { + if (!isset ($max)) {// greater or equal than min if ($value >= $min) { return ($inverse_interval==0)?true:false; } return ($inverse_interval==0)?false:true; } - if (!isset ($min)) { + if (!isset ($min)) {// smaller or equal than max if ($value <= $max) { return ($inverse_interval==0)?true:false; } return ($inverse_interval==0)?false:true; } - if (($max*1) == 0) { // ignore - return sla_check_value($value,$min,null, $inverse_interval); - } - if (($min*1) == 0) { // ignore - return sla_check_value($value,null,$max, $inverse_interval); - } if (($value >= $min) && ($value <= $max)) { return ($inverse_interval==0)?true:false; } return ($inverse_interval==0)?false:true; } +/** + * SLA downtime worktime + * + * Check (if needed) if the range specified by wt_start and wt_end is downtime + * + * Only used for inclusive downtimes calculation (from sla_fixed_worktime) + * + * @param int $wt_start start of the range + * @param int $wt_end end of the range + * @param hash $planned_downtimes array with the planned downtimes (ordered and merged) + * + * @return int returns the interval in downtime (false if no matches) + */ +function sla_downtime_worktime($wt_start, $wt_end, $inclusive_downtimes = 1, $planned_downtimes = null) { + if ((!isset($planned_downtimes)) || (!is_array($planned_downtimes))) { + return false; + } + + if ( (!isset($wt_start)) || (!isset($wt_end)) || ($wt_start > $wt_end)) { + return false; + } + + if ($inclusive_downtimes != 1) { + return false; + } + + $rt = false; + foreach ($planned_downtimes as $pd){ + if ( ($wt_start >= $pd["date_from"]) + && ($wt_start <= $pd["date_to"]) + && ($wt_end >= $pd["date_from"]) + && ($wt_end <= $pd["date_to"])) { + // ..[..start..end..].. + $rt = $wt_end - $wt_start; + break; + } + elseif ( ($wt_start < $pd["date_from"]) + && ($wt_end > $pd["date_from"]) + && ($wt_end < $pd["date_to"])) { + // ..start..[..end..].. + $rt = $wt_end - $pd["date_from"]; + break; + } + elseif ( ($wt_start >= $pd["date_from"]) + && ($wt_start < $pd["date_to"]) + && ($wt_end > $pd["date_to"])) { + // ..[..start..]..end.. + $rt = $wt_end - $pd["date_to"]; + break; + } + elseif ( ($wt_start >= $pd["date_to"]) + && ($wt_end >= $pd["date_to"])) { + // ..[..]..start..end.. + } + else { + // ..start..end..[..].. + } + } + + return $rt; +} + + /** * SLA fixed worktime * @@ -3784,13 +3906,15 @@ function sla_check_value($value, $min, $max, $inverse_interval = 0) { * As worktime is order (older ... newer) the idx works as flag to identify * last range checked, in order to improve the algorythm performance. * - * @param int $wt_start start of the range - * @param int $wt_end end of the range - * @param hash $worktime hash containing the valid intervals - * @param int $idx last ranges checked + * @param int $wt_start start of the range + * @param int $wt_end end of the range + * @param hash $worktime hash containing the valid intervals + * @param hash $planned_downtimes array with the planned downtimes (ordered and merged) + * @param int $inclusive_downtimes In downtime as OK (1) or ignored (0) + * @param int $idx last ranges checked * */ -function sla_fixed_worktime($wt_start, $wt_end, $worktime = null, $idx = 0) { +function sla_fixed_worktime($wt_start, $wt_end, $worktime = null, $planned_downtimes = null, $inclusive_downtimes = 1, $idx = 0) { $return = array(); @@ -3798,8 +3922,19 @@ function sla_fixed_worktime($wt_start, $wt_end, $worktime = null, $idx = 0) { $return["wt_valid"] = 1; $return["interval"] = $wt_end - $wt_start; + if ( (!isset($wt_start)) || (!isset($wt_end)) || ($wt_start > $wt_end)) { + $return["wt_valid"] = 0; + $return["interval"] = 0; + } + // No exclusions defined, entire worktime is valid if ((!isset($worktime) || (!is_array($worktime)))) { + $time_in_downtime = sla_downtime_worktime($wt_start, $wt_end, $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } return $return; } @@ -3819,54 +3954,97 @@ function sla_fixed_worktime($wt_start, $wt_end, $worktime = null, $idx = 0) { if ($start_fixed == 1) { // Intervals greater than 1 DAY if ($wt_end < $wt["date_from"]) { + // Case G: ..end..[..].. + $time_in_downtime = sla_downtime_worktime($wt_start, $wt_end, $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } + // Ignore older worktimes + $return["idx"] = $i; return $return; } if ( ($wt_end >= $wt["date_from"]) - && ($wt_end <= $wt["date_to"])) { + && ($wt_end <= $wt["date_to"])) { + // Case H: ..[..end..].. // add last slice $return["interval"] += $wt_end - $wt["date_from"]; + $time_in_downtime = sla_downtime_worktime($wt["date_from"], $wt_end, $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } return $return; } - if ( ($wt_end >= $wt["date_from"]) - && ($wt_end <= $wt["date_to"])) { + if ( ($wt_end > $wt["date_from"]) + && ($wt_end > $wt["date_to"])) { + // Case H: ..[..]..end.. // Add current slice and continue checking $return["interval"] += $wt["date_to"] - $wt["date_from"]; - // Also ignore this slice - $return["idx"] = $i; + $time_in_downtime = sla_downtime_worktime($wt["date_from"], $wt["date_to"], $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } } } else { if ( ($wt_start < $wt["date_from"]) - && ($wt_end < $wt["date_from"])) { + && ($wt_end < $wt["date_from"])) { // Case A: ..start..end..[...]...... $return["wt_valid"] = 0; + $return["idx"] = $i; return $return; } if ( ($wt_start <= $wt["date_from"]) - && ($wt_end >= $wt["date_from"]) - && ($wt_end <= $wt["date_to"])) { + && ($wt_end >= $wt["date_from"]) + && ($wt_end < $wt["date_to"])) { // Case B: ...start..[..end..]...... $return["wt_valid"] = 1; $return["interval"] = $wt_end - $wt["date_from"]; + $time_in_downtime = sla_downtime_worktime($wt["date_from"], $wt_end, $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } return $return; } if ( ($wt_start >= $wt["date_from"]) - && ($wt_start <= $wt["date_to"]) - && ($wt_end >= $wt["date_from"]) - && ($wt_end <= $wt["date_to"])) { + && ($wt_start <= $wt["date_to"]) + && ($wt_end >= $wt["date_from"]) + && ($wt_end <= $wt["date_to"])) { // Case C: ...[..start..end..]...... $return["wt_valid"] = 1; + $time_in_downtime = sla_downtime_worktime($wt_start, $wt_end, $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } + return $return; } if ( ($wt_start >= $wt["date_from"]) - && ($wt_start <= $wt["date_to"]) - && ($wt_end > $wt["date_to"])) { + && ($wt_start < $wt["date_to"]) + && ($wt_end > $wt["date_to"])) { // Case D: ...[..start..]...end..... $return["interval"] = $wt["date_to"] - $wt_start; + $time_in_downtime = sla_downtime_worktime($wt_start, $wt["date_to"], $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } $return["wt_valid"] = 1; $start_fixed = 1; + // we must check if 'end' is greater than the next valid worktime range start time + // unless is the last one if (($i+1) == $total) { // if there's no more worktime ranges to check return the accumulated return $return; @@ -3875,10 +4053,16 @@ function sla_fixed_worktime($wt_start, $wt_end, $worktime = null, $idx = 0) { } if ( ($wt_start < $wt["date_from"]) - && ($wt_end > $wt["date_to"])) { + && ($wt_end > $wt["date_to"])) { // Case E: ...start...[...]...end... $return["wt_valid"] = 1; $return["interval"] = $wt["date_to"] - $wt["date_from"]; + $time_in_downtime = sla_downtime_worktime($wt["date_from"], $wt["date_to"], $inclusive_downtimes, $planned_downtimes); + if ($time_in_downtime != false) { + $return["wt_in_downtime"] = 1; + $return["downtime_interval"] = $time_in_downtime; + $return["interval"] -= $time_in_downtime; + } if (($wt_end - $wt_start) < SECONDS_1DAY) { // Interval is less than 1 day @@ -3891,7 +4075,7 @@ function sla_fixed_worktime($wt_start, $wt_end, $worktime = null, $idx = 0) { } if ( ($wt_start > $wt["date_to"]) - && ($wt_end > $wt["date_to"])) { + && ($wt_end > $wt["date_to"])) { // Case F: ...[....]..start...end... // Invalid, check next worktime hole $return["wt_valid"] = 0; @@ -3909,23 +4093,24 @@ function sla_fixed_worktime($wt_start, $wt_end, $worktime = null, $idx = 0) { /** * Advanced SLA result with summary * - * @param int $id_agent_module id_agent_module - * @param int $time_from Time start - * @param int $time_to time end - * @param int $min_value minimum value for OK status - * @param int $max_value maximum value for OK status - * @param int $inverse_interval inverse interval (range) for OK status - * @param hash $daysWeek Days of active work times (M-T-W-T-V-S-S) - * @param int $timeFrom Start of work time, in each day - * @param int $timeTo End of work time, in each day - * @param int $slices Number of reports (time division) + * @param int $id_agent_module id_agent_module + * @param int $time_from Time start + * @param int $time_to time end + * @param int $min_value minimum value for OK status + * @param int $max_value maximum value for OK status + * @param int $inverse_interval inverse interval (range) for OK status + * @param hash $daysWeek Days of active work times (M-T-W-T-V-S-S) + * @param int $timeFrom Start of work time, in each day + * @param int $timeTo End of work time, in each day + * @param int $slices Number of reports (time division) + * @param int $inclusive_downtimes In downtime as OK (1) or ignored (0) * - * @return array Returns a hash with the calculated data + * @return array Returns a hash with the calculated data * */ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = null, - $min_value = null, $max_value = null, $inverse_interval = null, $daysWeek = null, - $timeFrom = null, $timeTo = null, $slices = 1) { + $min_value = null, $max_value = null, $inverse_interval = 0, $daysWeek = null, + $timeFrom = null, $timeTo = null, $slices = 1, $inclusive_downtimes = 1) { // In content: // @@ -3940,7 +4125,7 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $slices = 1; } - if (!isset($min_value) && (!isset($max_value) && (!isset($inverse_interval)))) { + if ( (!isset($min_value)) && (!isset($max_value)) ) { // Infer availability range based on the critical thresholds $agentmodule_info = modules_get_agentmodule($id_agent_module); @@ -3949,11 +4134,15 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $max_value = $agentmodule_info["max_critical"]; $inverse_interval = $agentmodule_info["critical_inverse"]==0?1:0; - if (!isset($min_value)){ - $min_value = 0; + if ( (!isset($min_value)) || ($min_value == 0)) { + $min_value = null; } - if (!isset($max_value)){ + if ( (!isset($max_value)) || ($max_value == 0)) { + $max_value = null; + } + if ( (!(isset($max_value))) && (!(isset($min_value))) ) { $max_value = 0; + $min_value = 0; } } @@ -4051,7 +4240,7 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $n++; } } - if ( ($n == count($daysWeek)) && ($timeFrom == $timeTo) && (!is_array($planned_downtimes)) ) { + if ( ($n == count($daysWeek)) && ($timeFrom == $timeTo) ) { // Ignore custom ranges $worktime = null; } @@ -4094,8 +4283,8 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $wt_end += SECONDS_1DAY; } - // Check if in planned downtime - if (is_array($planned_downtimes)) { + // Check if in planned downtime if exclusive downtimes + if ( ($inclusive_downtimes == 0) && (is_array($planned_downtimes)) ) { $start_fixed = 0; $n_planned_downtimes = count($planned_downtimes); @@ -4217,13 +4406,14 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = } // Finished: Build exceptions // DEBUG -// print "Umcompressed data debug:\n"; +// print "
Umcompressed data debug:\n";
 // foreach ($uncompressed_data as $k => $caja) {
 // 	print "caja: $k\t" . $caja["utimestamp"] . "\n";
 // 	foreach ($caja["data"] as $dato) {
 // 		print "\t" . $dato["utimestamp"] . "\t" . $dato["datos"] . "\t" . date("Y/m/d H:i:s",$dato["utimestamp"]) . "\t" . $dato["obs"] . "\n";
 // 	}
 // }
+// print "
"; // Initialization @@ -4251,6 +4441,8 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $time_in_error = 0; $time_in_unknown = 0; $time_in_not_init = 0; + $time_in_down = 0; + $time_out = 0; // checks $bad_checks = 0; @@ -4326,42 +4518,57 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $wt_start = $current_data["utimestamp"]; $wt_end = $next_timestamp; - // Remove time spent in planned downtime and not in planning - $wt_check = sla_fixed_worktime($wt_start, $wt_end, $worktime, $wt_check["idx"]); + // Remove time spent not in planning (and in planned downtime if needed) + $wt_check = sla_fixed_worktime($wt_start, $wt_end, $worktime, $planned_downtimes, $inclusive_downtimes, $wt_check["idx"]); $time_interval = $wt_check["interval"]; - if ($time_interval == 0){ - continue; - } - if ($wt_check["wt_valid"] == 1) { - $total_checks++; + if (($wt_check["wt_valid"] == 1)) { $time_total += $time_interval; - if ((isset ($current_data["datos"])) && ($current_data["datos"] !== false)) { - // not unknown nor not init values - if (sla_check_value($current_data["datos"],$min_value, $max_value, $inverse_interval)) { - $ok_checks++; - $time_in_ok += $time_interval; + if ($time_interval > 0) { + $total_checks++; + if ((isset ($current_data["datos"])) && ($current_data["datos"] !== false)) { + // not unknown nor not init values + if (sla_check_value($current_data["datos"],$min_value, $max_value, $inverse_interval)) { + $ok_checks++; + $time_in_ok += $time_interval; + + } + else { + $bad_checks++; + $time_in_error += $time_interval; + } } else { - $bad_checks++; - $time_in_error += $time_interval; + if($current_data["datos"] === null) { + $time_in_unknown += $time_interval; + $unknown_checks++; + } + elseif ($current_data["datos"] === false) { + $time_in_not_init += $time_interval; + $not_init_checks++; + } } } - else { - if($current_data["datos"] === null) { - $time_in_unknown += $time_interval; - $unknown_checks++; - } - elseif ($current_data["datos"] === false) { - $time_in_not_init += $time_interval; - $not_init_checks++; + + if ($inclusive_downtimes == 1) { + if ($wt_check["wt_in_downtime"]) { + // Add downtime interval as OK in inclusion mode + $total_checks++; + $ok_checks++; + $time_in_ok += $wt_check["downtime_interval"]; + $time_total += $wt_check["downtime_interval"]; + $time_in_down += $wt_check["downtime_interval"]; } } } else { + $time_out += $time_interval; + if ($wt_check["wt_in_downtime"]) { + $time_out += $wt_check["downtime_interval"]; + } // ignore worktime, is in an invalid period: - // scheduled downtimes + // scheduled downtimes in exclusion mode // not 24x7 sla's } } // End of pool items analysis (for) @@ -4375,7 +4582,8 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = } else { // If monitor in not-init status => no data to show - $time_in_not_init = $datetime_to - $datetime_from; + $time_in_not_init = $datetime_to - $datetime_from; + $time_total += $time_in_not_init; $not_init_checks++; } @@ -4386,6 +4594,8 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = $return["time_error"] = $time_in_error; $return["time_unknown"] = $time_in_unknown; $return["time_not_init"] = $time_in_not_init; + $return["time_downtime"] = $time_in_down; + $return["time_out"] = $time_out; // # Checks $return["checks_total"] = $total_checks; @@ -4405,6 +4615,10 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = // SLA $return["SLA_fixed"] = sla_truncate($return["SLA"], $config['graph_precision']); + // Time ranges + $return["date_from"] = $datetime_from; + $return["date_to"] = $datetime_to; + if ($slices > 1) { array_push($global_return, $return); } @@ -4418,8 +4632,6 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to = return $return; } - - function reporting_availability($report, $content, $date=false, $time=false) { global $config; @@ -4514,97 +4726,55 @@ function reporting_availability($report, $content, $date=false, $time=false) { $text = ""; + $row['data'] = reporting_advanced_sla( + $item['id_agent_module'], + $report["datetime"] - $content['period'], + $report["datetime"], + null, // min_value -> dynamic + null, // max_value -> dynamic + null, // inverse_interval -> dynamic + array ( "1" => $content["sunday"], + "2" => $content["monday"], + "3" => $content["tuesday"], + "4" => $content["wednesday"], + "5" => $content["thursday"], + "6" => $content["friday"], + "7" => $content["saturday"] + ), + $content['time_from'], + $content['time_to'] + ); + // HACK it is saved in show_graph field. // Show interfaces instead the modules if ($content['show_graph']) { - $text = $row['availability_item'] = agents_get_address( + $text = $row['data']['availability_item'] = agents_get_address( modules_get_agentmodule_agent($item['id_agent_module'])); if (empty($text)) { - $text = $row['availability_item'] = __('No Address'); + $text = $row['data']['availability_item'] = __('No Address'); } } else { - $text = $row['availability_item'] = modules_get_agentmodule_name( + $text = $row['data']['availability_item'] = modules_get_agentmodule_name( $item['id_agent_module']); } - $row['agent'] = modules_get_agentmodule_agent_name( + $row['data']['agent'] = modules_get_agentmodule_agent_name( $item['id_agent_module']); - $text = $row['agent'] . " (" . $text . ")"; + $text = $row['data']['agent'] . " (" . $text . ")"; - $sla_value = reporting_get_agentmodule_sla( - $item['id_agent_module'], - $content['period'], - 0.50, - 1.50, - $report["datetime"], - null, - $content['time_from'], - $content['time_to']); - - $item['interval_agent_module'] = modules_get_interval ($item['id_agent_module']); - $unknown_seconds = modules_get_unknown_time ($item['id_agent_module'], $report["datetime"], $content['period']); - if ($unknown_seconds !== false) { - $count_checks = (int)(($content['period'] - $unknown_seconds)/$item['interval_agent_module']); - } - - if ($sla_value === false) { - $row['checks'] = __('Unknown'); - $row['failed'] = __('Unknown'); - $row['fail'] = __('Unknown'); - $row['poling_time'] = __('Unknown'); - $row['time_unavaliable'] = __('Unknown'); - $row['ok'] = __('Unknown'); - $row['order'] = 0; - - $percent_ok = 0; - } - else { - $percent_ok = $sla_value; - $percent_fail = (100 - $percent_ok); - - $row['checks'] = format_numeric($count_checks, 0); - $row['ok'] = $percent_ok . " %"; - $row['order'] = $percent_ok; - $row['fail'] = $percent_fail . " %"; - - //$row['failed'] = format_numeric($percent_fail * $count_checks / 100, 0); - //if the value of time in failures is less than those recorded in the database the number of errors that have registered in the database is set + /* + //Restore dbconnection + if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) { + metaconsole_restore_db(); + } + */ + //find order + $row['data']['order'] = $row['data']['SLA']; - $count_time_failed = ceil($percent_fail * $count_checks / 100); - - $sql_count_failed = 'SELECT count(*) FROM tagente_datos WHERE datos = 0 AND id_agente_modulo =' . $item['id_agent_module']; - $count_failed = db_get_value_sql($sql_count_failed); - - if($count_failed < $count_time_failed){ - $row['failed'] = $count_time_failed; - } else { - $row['failed'] = $count_failed; - } - - $row['poling_time'] = "-"; - if ($percent_ok > 0) { - $row['poling_time'] = - human_time_description_raw( - ($percent_ok * $count_checks / 100) * modules_get_interval($item['id_agent_module']), - true); - } - - $row['time_unavaliable'] = "-"; - if ($percent_fail > 0) { - $row['time_unavaliable'] = - human_time_description_raw( - ($percent_fail * $count_checks / 100) * modules_get_interval($item['id_agent_module']), - true); - } - - } - - $data[] = $row; - - + $percent_ok = $row['data']['SLA']; $avg = (($avg * $count) + $percent_ok) / ($count + 1); if (is_null($min)) { $min = $percent_ok; @@ -4626,24 +4796,18 @@ function reporting_availability($report, $content, $date=false, $time=false) { $max_text = $text; } } - - - //Restore dbconnection - if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) { - metaconsole_restore_db(); - } - + + $data[] = $row['data']; $count++; } - switch ($content['order_uptodown']) { case REPORT_ITEM_ORDER_BY_AGENT_NAME: $temp = array(); foreach ($data as $row) { $i = 0; foreach ($temp as $t_row) { - if (strcmp($row['agent'], $t_row['agent']) < 0) { + if (strcmp($row['data']['agent'], $t_row['agent']) < 0) { break; } @@ -4660,7 +4824,7 @@ function reporting_availability($report, $content, $date=false, $time=false) { foreach ($data as $row) { $i = 0; foreach ($temp as $t_row) { - if ($row['order'] < $t_row['order']) { + if ($row['data']['SLA'] < $t_row['order']) { break; } @@ -4678,7 +4842,7 @@ function reporting_availability($report, $content, $date=false, $time=false) { $i = 0; foreach ($temp as $t_row) { - if ($row['order'] > $t_row['order']) { + if ($row['data']['SLA'] > $t_row['order']) { break; } @@ -4701,7 +4865,6 @@ function reporting_availability($report, $content, $date=false, $time=false) { $return["resume"]['max_text'] = $max_text; $return["resume"]['max'] = $max; - return reporting_check_structure_content($return); } diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 8a2dd9db6e..e5d9bd2c75 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -319,111 +319,309 @@ function reporting_html_SLA($table, $item, $mini) { $table->data['planned_downtime']['cell'] = $downtimes_table; } } - - $table1 = new stdClass(); - $table1->width = '99%'; - - $table1->align = array(); - $table1->align[0] = 'left'; - $table1->align[1] = 'left'; - $table1->align[2] = 'right'; - $table1->align[3] = 'right'; - $table1->align[4] = 'right'; - $table1->align[5] = 'right'; - - $table1->data = array (); - - $table1->head = array (); - $table1->head[0] = __('Agent'); - $table1->head[1] = __('Module'); - $table1->head[2] = __('Max/Min Values'); - $table1->head[3] = __('SLA Limit'); - $table1->head[4] = __('SLA Compliance'); - $table1->head[5] = __('Status'); - - $table1->headstyle = array(); - $table1->headstyle[2] = 'text-align: right'; - $table1->headstyle[3] = 'text-align: right'; - $table1->headstyle[4] = 'text-align: right'; - $table1->headstyle[5] = 'text-align: right'; - - foreach ($item['data'] as $sla) { - $the_first_men_time = get_agent_first_time(io_safe_output($sla['agent'])); - if (!$hide_notinit_agent) { - $row = array(); - $row[] = $sla['agent']; - $row[] = $sla['module']; - $row[] = remove_right_zeros(number_format($sla['max'], $config['graph_precision'])) . " / " . remove_right_zeros(number_format($sla['min'], $config['graph_precision'])); - $row[] = round($sla['sla_limit'], 2) . "%"; - - if ($sla['sla_value_unknown']) { - $row[] = '' . - __('N/A') . ''; - $row[] = '' . - __('Unknown') . ''; - } - elseif ($sla['sla_status']) { - $row[] = '' . - remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; - $row[] = '' . - __('OK') . ''; - } - else { - $row[] = '' . - remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; - $row[] = '' . - __('Fail') . ''; - } - } - else { - if ($item['date']['to'] > $the_first_men_time) { - $row = array(); - $row[] = $sla['agent']; - $row[] = $sla['module']; - $row[] = remove_right_zeros(number_format($sla['max'], $config['graph_precision'])) . " / " . remove_right_zeros(number_format($sla['min'], $config['graph_precision'])); - $row[] = round($sla['sla_limit'], 2) . "%"; - - if ($sla['sla_value_unknown']) { - $row[] = '' . - __('N/A') . ''; - $row[] = '' . - __('Unknown') . ''; - } - elseif ($sla['sla_status']) { - $row[] = '' . - remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; - $row[] = '' . - __('OK') . ''; + + if(isset($item['data'])){ + $table1 = new stdClass(); + $table1->width = '99%'; + + $table1->align = array(); + $table1->align[0] = 'left'; + $table1->align[1] = 'left'; + $table1->align[2] = 'right'; + $table1->align[3] = 'right'; + $table1->align[4] = 'right'; + $table1->align[5] = 'right'; + + $table1->data = array (); + + $table1->head = array (); + $table1->head[0] = __('Agent'); + $table1->head[1] = __('Module'); + $table1->head[2] = __('Max/Min Values'); + $table1->head[3] = __('SLA Limit'); + $table1->head[4] = __('SLA Compliance'); + $table1->head[5] = __('Status'); + + $table1->headstyle = array(); + $table1->headstyle[2] = 'text-align: right'; + $table1->headstyle[3] = 'text-align: right'; + $table1->headstyle[4] = 'text-align: right'; + $table1->headstyle[5] = 'text-align: right'; + + //second_table for time globals + $table2 = new stdClass(); + $table2->width = '99%'; + + $table2->align = array(); + $table2->align[0] = 'left'; + $table2->align[1] = 'left'; + $table2->align[2] = 'right'; + $table2->align[3] = 'right'; + $table2->align[4] = 'right'; + $table2->align[5] = 'right'; + $table2->align[6] = 'right'; + + $table2->data = array (); + + $table2->head = array (); + $table2->head[0] = __('Global Time'); + $table2->head[1] = __('Time Total'); + $table2->head[2] = __('Time Failed'); + $table2->head[3] = __('Time OK'); + $table2->head[4] = __('Time Unknown'); + $table2->head[5] = __('Time Not Init'); + $table2->head[6] = __('Downtime'); + + $table2->headstyle = array(); + $table2->headstyle[2] = 'text-align: right'; + $table2->headstyle[3] = 'text-align: right'; + $table2->headstyle[4] = 'text-align: right'; + $table2->headstyle[5] = 'text-align: right'; + $table2->headstyle[6] = 'text-align: right'; + + //third_table for time globals + $table3 = new stdClass(); + $table3->width = '99%'; + + $table3->align = array(); + $table3->align[0] = 'left'; + $table3->align[1] = 'left'; + $table3->align[2] = 'right'; + $table3->align[3] = 'right'; + $table3->align[4] = 'right'; + $table3->align[5] = 'right'; + $table3->align[6] = 'right'; + + $table3->data = array (); + + $table3->head = array (); + $table3->head[0] = __('Checks Time'); + $table3->head[1] = __('Checks Total'); + $table3->head[2] = __('Checks Failed'); + $table3->head[3] = __('Checks OK'); + $table3->head[4] = __('Checks Unknown'); + + $table3->headstyle = array(); + $table3->headstyle[2] = 'text-align: right'; + $table3->headstyle[3] = 'text-align: right'; + $table3->headstyle[4] = 'text-align: right'; + $table3->headstyle[5] = 'text-align: right'; + + foreach ($item['data'] as $sla) { + if(isset($sla)){ + $the_first_men_time = get_agent_first_time(io_safe_output($sla['agent'])); + if (!$hide_notinit_agent) { + //first_table + $row = array(); + $row[] = $sla['agent']; + $row[] = $sla['module']; + + if(is_numeric($sla['dinamic_text'])){ + $row[] = remove_right_zeros(number_format($sla['max'], $config['graph_precision'])) . " / " . + remove_right_zeros(number_format($sla['min'], $config['graph_precision'])); + } + else{ + $row[] = $sla['dinamic_text']; + } + $row[] = round($sla['sla_limit'], 2) . "%"; + + if ($sla['sla_value_unknown']) { + $row[] = '' . + __('N/A') . ''; + $row[] = '' . + __('Unknown') . ''; + } + elseif ($sla['sla_status']) { + $row[] = '' . + remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; + $row[] = '' . + __('OK') . ''; + } + else { + $row[] = '' . + remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; + $row[] = '' . + __('Fail') . ''; + } + + //second table for time globals + $row2 = array(); + $row2[] = $sla['agent'] . ' -- [' . $sla['module'] . ']'; + + if($sla['time_total'] != 0) + $row2[] = human_time_description_raw($sla['time_total']); + else + $row2[] = '--'; + + if($sla['time_error'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_error'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_ok'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_ok'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_unknown'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_unknown'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_not_init'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_not_init'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_downtime'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_downtime'], true) . ''; + else + $row2[] = '--'; + + //third table for checks globals + $row3 = array(); + $row3[] = $sla['agent'] . ' -- [' . $sla['module'] . ']'; + $row3[] = $sla['checks_total']; + $row3[] = '' . $sla['checks_error'] . ''; + $row3[] = '' . $sla['checks_ok'] . ''; + $row3[] = '' . $sla['checks_unknown'] . ''; + } else { - $row[] = '' . - remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; - $row[] = '' . - __('Fail') . ''; + if ($item['date']['to'] > $the_first_men_time) { + //first_table + $row = array(); + $row[] = $sla['agent']; + $row[] = $sla['module']; + $row[] = remove_right_zeros(number_format($sla['max'], $config['graph_precision'])) . " / " . remove_right_zeros(number_format($sla['min'], $config['graph_precision'])); + $row[] = round($sla['sla_limit'], 2) . "%"; + + if ($sla['sla_value_unknown']) { + $row[] = '' . + __('N/A') . ''; + $row[] = '' . + __('Unknown') . ''; + } + elseif ($sla['sla_status']) { + $row[] = '' . + remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; + $row[] = '' . + __('OK') . ''; + } + else { + $row[] = '' . + remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . ''; + $row[] = '' . + __('Fail') . ''; + } + + //second table for time globals + $row2 = array(); + $row2[] = $sla['agent'] . ' -- [' . $sla['module'] . ']'; + + if($sla['time_total'] != 0) + $row2[] = human_time_description_raw($sla['time_total']); + else + $row2[] = '--'; + + if($sla['time_error'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_error'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_ok'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_ok'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_unknown'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_unknown'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_not_init'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_not_init'], true) . ''; + else + $row2[] = '--'; + + if($sla['time_downtime'] != 0) + $row2[] = '' . human_time_description_raw($sla['time_downtime'], true) . ''; + else + $row2[] = '--'; + + //third table for checks globals + $row3 = array(); + $row3[] = $sla['agent'] . ' -- [' . $sla['module'] . ']'; + $row3[] = $sla['checks_total']; + $row3[] = '' . $sla['checks_error'] . ''; + $row3[] = '' . $sla['checks_ok'] . ''; + $row3[] = '' . $sla['checks_unknown'] . ''; + } } + + $table1->data[] = $row; + $table2->data[] = $row2; + $table3->data[] = $row3; } } - $table1->data[] = $row; + $table->colspan['sla']['cell'] = 2; + $table->data['sla']['cell'] = html_print_table($table1, true); + $table->colspan['time_global']['cell'] = 2; + $table->data['time_global']['cell'] = html_print_table($table2, true); + $table->colspan['checks_global']['cell'] = 2; + $table->data['checks_global']['cell'] = html_print_table($table3, true); } - $table->colspan['sla']['cell'] = 3; - $table->data['sla']['cell'] = html_print_table($table1, true); - if (!empty($item['charts'])) { $table1 = new stdClass(); $table1->width = '99%'; $table1->data = array (); - - foreach ($item['charts'] as $chart) { - $table1->data[] = array( - $chart['agent'] . "
" . $chart['module'], - $chart['chart']); + if (!$hide_notinit_agent) { + foreach ($item['charts'] as $chart) { + $table1->data[] = array( + $chart['agent'] . "
" . $chart['module'], + $chart['chart']); + } } - - $table->colspan['charts']['cell'] = 3; + else{ + foreach ($item['charts'] as $chart) { + $the_first_men_time = get_agent_first_time(io_safe_output($chart['agent'])); + if ($item['date']['to'] > $the_first_men_time) { + $table1->data[] = array( + $chart['agent'] . "
" . $chart['module'], + $chart['chart']); + } + } + } + $table->colspan['charts']['cell'] = 2; $table->data['charts']['cell'] = html_print_table($table1, true); + + //table_legend_graphs; + $table1 = new stdClass(); + $table1->width = '99%'; + $table1->data = array (); + $table1->data[0][0] = '
'; + $table1->data[0][0] .= ''.__('OK') . ''; + + $table1->data[0][1] = '
'; + $table1->data[0][1] .= ''.__('Critical'). ''; + + $table1->data[0][2] = '
'; + $table1->data[0][2] .= ''.__('Unknow'). ''; + + $table1->data[0][3] = '
'; + $table1->data[0][3] .= ''.__('Not Init'). ''; + + $table1->data[0][4] = '
'; + $table1->data[0][4] .= ''.__('Downtimes'). ''; + + $table1->data[0][5] = '
'; + $table1->data[0][5] .= ''.__('Ignore time'). ''; + + $table->colspan['legend']['cell'] = 2; + $table->data['legend']['cell'] = html_print_table($table1, true); } } } @@ -1718,30 +1916,72 @@ function reporting_html_availability(&$table, $item) { else { $table1->head[1] = __('Module'); } - $table1->head[2] = __('# Checks'); - $table1->head[3] = __('# Failed'); - $table1->head[4] = __('% Fail'); - $table1->head[5] = __('Time available'); - $table1->head[6] = __('Time unavailable'); - $table1->head[7] = __('% Ok'); + $table1->head[2] = __('Total time'); + $table1->head[3] = __('Time failed'); + $table1->head[4] = __('Time OK'); + $table1->head[5] = __('Time Uknown'); + $table1->head[6] = __('Time Not Init Module'); + $table1->head[7] = __('Time Downtime'); + $table1->head[8] = __('% Ok'); $table1->headstyle = array(); - $table1->headstyle[2] = 'text-align: right'; - $table1->headstyle[3] = 'text-align: right'; - $table1->headstyle[4] = 'text-align: right'; - $table1->headstyle[5] = 'text-align: right'; - $table1->headstyle[6] = 'text-align: right'; - $table1->headstyle[7] = 'text-align: right'; + $table1->headstyle[0] = 'text-align: left'; + $table1->headstyle[1] = 'text-align: left'; + $table1->headstyle[2] = 'text-align: right'; + $table1->headstyle[3] = 'text-align: right'; + $table1->headstyle[4] = 'text-align: right'; + $table1->headstyle[5] = 'text-align: right'; + $table1->headstyle[6] = 'text-align: right'; + $table1->headstyle[7] = 'text-align: right'; + $table1->headstyle[8] = 'text-align: right'; - $table1->style[0] = 'text-align: left'; - $table1->style[1] = 'text-align: left'; - $table1->style[2] = 'text-align: right'; - $table1->style[3] = 'text-align: right'; - $table1->style[4] = 'text-align: right'; - $table1->style[5] = 'text-align: right'; - $table1->style[6] = 'text-align: right'; - $table1->style[7] = 'text-align: right'; + $table1->style[0] = 'text-align: left'; + $table1->style[1] = 'text-align: left'; + $table1->style[2] = 'text-align: right'; + $table1->style[3] = 'text-align: right'; + $table1->style[4] = 'text-align: right'; + $table1->style[5] = 'text-align: right'; + $table1->style[6] = 'text-align: right'; + $table1->style[7] = 'text-align: right'; + $table1->style[8] = 'text-align: right'; + + $table2 = new stdClass(); + $table2->width = '99%'; + $table2->data = array (); + + $table2->head = array (); + $table2->head[0] = __('Agent'); + // HACK it is saved in show_graph field. + // Show interfaces instead the modules + if ($item['kind_availability'] == 'address') { + $table2->head[1] = __('IP Address'); + } + else { + $table2->head[1] = __('Module'); + } + $table2->head[2] = __('Total checks'); + $table2->head[3] = __('Checks failed'); + $table2->head[4] = __('Checks OK'); + $table2->head[5] = __('Checks Uknown'); + //$table2->head[6] = __('% Ok'); + + $table2->headstyle = array(); + $table2->headstyle[0] = 'text-align: left'; + $table2->headstyle[1] = 'text-align: left'; + $table2->headstyle[2] = 'text-align: right'; + $table2->headstyle[3] = 'text-align: right'; + $table2->headstyle[4] = 'text-align: right'; + $table2->headstyle[5] = 'text-align: right'; + //$table2->headstyle[6] = 'text-align: right'; + $table2->style[0] = 'text-align: left'; + $table2->style[1] = 'text-align: left'; + $table2->style[2] = 'text-align: right'; + $table2->style[3] = 'text-align: right'; + $table2->style[4] = 'text-align: right'; + $table2->style[5] = 'text-align: right'; + //$table2->style[6] = 'text-align: right'; + foreach ($item['data'] as $row) { $the_first_men_time = get_agent_first_time(io_safe_output($row['agent'])); @@ -1749,31 +1989,102 @@ function reporting_html_availability(&$table, $item) { $table_row = array(); $table_row[] = $row['agent']; $table_row[] = $row['availability_item']; - $table_row[] = $row['checks']; - $table_row[] = $row['failed']; - $table_row[] = remove_right_zeros(number_format($row['fail'], $config['graph_precision'])); - $table_row[] = $row['poling_time']; - $table_row[] = $row['time_unavaliable']; - $table_row[] = remove_right_zeros(number_format($row['ok'], $config['graph_precision'])); + + if($row['time_total'] != 0) + $table_row[] = human_time_description_raw($row['time_total'], true); + else + $table_row[] = '--'; + + if($row['time_error'] != 0) + $table_row[] = human_time_description_raw($row['time_error'], true); + else + $table_row[] = '--'; + + if($row['time_ok'] != 0) + $table_row[] = human_time_description_raw($row['time_ok'], true); + else + $table_row[] = '--'; + + if($row['time_unknown'] != 0) + $table_row[] = human_time_description_raw($row['time_unknown'], true); + else + $table_row[] = '--'; + + if($row['time_not_init'] != 0) + $table_row[] = human_time_description_raw($row['time_not_init'], true); + else + $table_row[] = '--'; + + if($row['time_downtime'] != 0) + $table_row[] = human_time_description_raw($row['time_downtime'], true); + else + $table_row[] = '--'; + + $table_row[] = '' .remove_right_zeros(number_format($row['SLA'], $config['graph_precision'])). '%'; + + $table_row2 = array(); + $table_row2[] = $row['agent']; + $table_row2[] = $row['availability_item']; + $table_row2[] = $row['checks_total']; + $table_row2[] = $row['checks_error']; + $table_row2[] = $row['checks_ok']; + $table_row2[] = $row['checks_unknown']; + //$table_row2[] = remove_right_zeros(number_format($row['SLA'], $config['graph_precision'])); } else { if ($item['date']['to'] > $the_first_men_time) { $table_row = array(); $table_row[] = $row['agent']; $table_row[] = $row['availability_item']; - $table_row[] = $row['checks']; - $table_row[] = $row['failed']; - $table_row[] = remove_right_zeros(number_format($row['fail'], $config['graph_precision'])); - $table_row[] = $row['poling_time']; - $table_row[] = $row['time_unavaliable']; - $table_row[] = remove_right_zeros(number_format($row['ok'], $config['graph_precision'])); + + if($row['time_total'] != 0) + $table_row[] = human_time_description_raw($row['time_total'], true); + else + $table_row[] = '--'; + + if($row['time_error'] != 0) + $table_row[] = human_time_description_raw($row['time_error'], true); + else + $table_row[] = '--'; + + if($row['time_ok'] != 0) + $table_row[] = human_time_description_raw($row['time_ok'], true); + else + $table_row[] = '--'; + + if($row['time_unknown'] != 0) + $table_row[] = human_time_description_raw($row['time_unknown'], true); + else + $table_row[] = '--'; + + if($row['time_not_init'] != 0) + $table_row[] = human_time_description_raw($row['time_not_init'], true); + else + $table_row[] = '--'; + + if($row['time_downtime'] != 0) + $table_row[] = human_time_description_raw($row['time_downtime'], true); + else + $table_row[] = '--'; + + $table_row[] = '' .remove_right_zeros(number_format($row['SLA'], $config['graph_precision'])). '%'; + + $table_row2 = array(); + $table_row2[] = $row['agent']; + $table_row2[] = $row['availability_item']; + $table_row2[] = $row['checks_total']; + $table_row2[] = $row['checks_error']; + $table_row2[] = $row['checks_ok']; + $table_row2[] = $row['checks_unknown']; + //$table_row2[] = remove_right_zeros(number_format($row['SLA'], $config['graph_precision'])); } else { - $same_agent_in_resume = $row['agent']; + $same_agent_in_resume = $item['data']['agent']; } } $table1->data[] = $table_row; + $table2->data[] = $table_row2; } } else { @@ -1782,10 +2093,14 @@ function reporting_html_availability(&$table, $item) { __('There are no Agent/Modules defined'); } - $table->colspan[1][0] = 3; + $table->colspan[1][0] = 2; + $table->colspan[2][0] = 2; $data = array(); $data[0] = html_print_table($table1, true); + $data2 = array(); + $data2[0] = html_print_table($table2, true); array_push ($table->data, $data); + array_push ($table->data, $data2); if ($item['resume'] && !empty($item["data"])) { $table1->width = '99%'; @@ -1794,35 +2109,34 @@ function reporting_html_availability(&$table, $item) { if (($same_agent_in_resume == "") && (strpos($item['resume']['min_text'], $same_agent_in_resume) === false)) { $table1->head = array (); $table1->head['max_text'] = __('Agent max value'); - $table1->head['max'] = __('Max Value'); - $table1->head['avg'] = __('Average Value'); + $table1->head['max'] = __('Max Value'); $table1->head['min_text'] = __('Agent min'); - $table1->head['min'] = __('Agent min Value'); + $table1->head['min'] = __('Agent min Value'); + $table1->head['avg'] = __('Average Value'); $table1->headstyle = array(); $table1->headstyle['min_text'] = 'text-align: left'; - $table1->headstyle['min'] = 'text-align: right'; - $table1->headstyle['avg'] = 'text-align: right'; + $table1->headstyle['min'] = 'text-align: right'; $table1->headstyle['max_text'] = 'text-align: left'; - $table1->headstyle['max'] = 'text-align: right'; - + $table1->headstyle['max'] = 'text-align: right'; + $table1->headstyle['avg'] = 'text-align: right'; $table1->style = array(); $table1->style['min_text'] = 'text-align: left'; - $table1->style['min'] = 'text-align: right'; - $table1->style['avg'] = 'text-align: right'; + $table1->style['min'] = 'text-align: right'; $table1->style['max_text'] = 'text-align: left'; - $table1->style['max'] = 'text-align: right'; + $table1->style['max'] = 'text-align: right'; + $table1->style['avg'] = 'text-align: right'; $table1->data[] = array( 'max_text' => $item['resume']['max_text'], 'max' => remove_right_zeros(number_format($item['resume']['max'], $config['graph_precision'])) . "%", - 'avg' => remove_right_zeros(number_format($item['resume']['avg'], $config['graph_precision'])) . "%", 'min_text' => $item['resume']['min_text'], - 'min' => remove_right_zeros(number_format($item['resume']['min'], $config['graph_precision'])) . "%" + 'min' => remove_right_zeros(number_format($item['resume']['min'], $config['graph_precision'])) . "%", + 'avg' => '' .remove_right_zeros(number_format($item['resume']['avg'], $config['graph_precision'])) . "%" ); - $table->colspan[2][0] = 3; + $table->colspan[3][0] = 3; $data = array(); $data[0] = html_print_table($table1, true); array_push ($table->data, $data); diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index d755560db2..b69ddcbcae 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -162,7 +162,7 @@ function slicesbar_graph($chart_data, $period, $width, $height, $colors, $id_graph = serialize_in_temp($graph, null, $ttl); - return ""; + return ""; } function vbar_graph($flash_chart, $chart_data, $width, $height, diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 40ad4f71a1..0fee829154 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3588,8 +3588,6 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px; .cargatextodialogo p, .cargatextodialogo b, .cargatextodialogo a{ font-size:18pt; - - } .readonly{ @@ -3598,4 +3596,15 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px; .input_error { border: 1px solid red; +} + +.legend_graphs_sla{ + width: 40px; + height: 15px; + float:left; + margin-left: 20px; +} +.label_legend_graph{ + float:left; + margin-left: 20px; } \ No newline at end of file