From 1247b5f69591441ac2bdfa378e2c4014caf1bbe5 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 12 Sep 2023 16:04:13 +0200 Subject: [PATCH 01/10] #11495 Create function for service level data --- pandora_console/include/functions_modules.php | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index e82fca400b..fd8461156c 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -4762,3 +4762,98 @@ function export_agents_module_csv($filters) return $result; } + + +/** + * Function to return Mean Time Between Failure, Mean Time To Solution (in seconds) + * and Availability of a module + * + * @param string $interval_start Start time of the interval. + * + * @param string $interval_end End time of the interval. + * + * @param string $id_agentmodule id_agentmodule of the module + * + * @return array Returns an array with the data + */ +function service_level_module_data($interval_start, $interval_end, $id_agentmodule) +{ + $data = []; + $data['mtbf'] = false; + $data['mtrs'] = false; + $data['availability'] = false; + + $interval_time = ($interval_end - $interval_start); + $current_time = time(); + $sql = 'SELECT utimestamp, event_type FROM tevento + WHERE id_agentmodule = '.$id_agentmodule.' + AND utimestamp >= '.$interval_start.' + AND utimestamp <= '.$interval_end.' + ORDER BY utimestamp DESC'; + + $events_time = db_get_all_rows_sql($sql); + if ($events_time !== false && count($events_time) > 0) { + $failed_event = []; + $normal_event = []; + foreach ($events_time as $event) { + if ($event['event_type'] === 'going_up_critical') { + $failed_event[] = $event['utimestamp']; + } + + if ($event['event_type'] === 'going_down_normal') { + $normal_event[] = $event['utimestamp']; + } + } + + $mtrs_array = []; + if (empty($normal_event) === true) { + $mtrs_array[] = ($current_time - $failed_event[0]); + } else if (empty($failed_event) === true) { + $mtrs_array[] = 0; + } else { + foreach ($normal_event as $key => $value) { + if (($failed_event[$key] - $normal_event[$key]) < 0) { + $mtrs_array[] = ($normal_event[$key] - $failed_event[$key]); + } else { + $mtrs_array[] = ($failed_event[$key] - $normal_event[$key]); + } + } + } + + $mtbf_array = []; + if (!empty($failed_event) === true) { + if (count($failed_event) > 1) { + for ($i = 1; $i <= array_key_last($failed_event); $i++) { + $mtbf_array[] = ($failed_event[($i - 1)] - $failed_event[$i]); + } + } else { + $mtbf_array[] = ($current_time - $failed_event[0]); + } + } else { + $mtbf_array[] = 0; + } + + $total_time_failed = array_sum($mtbf_array); + $total_time_ok = ($interval_time - $total_time_failed); + if (count($events_time) === 1) { + if ($events_time[0]['event_type'] === 'going_up_critical') { + $availability = '0'; + } + + if ($events_time[0]['event_type'] === 'going_down_normal') { + $availability = '100'; + } + } else { + $availability = round((($total_time_ok / $interval_time) * 100), 2); + } + + $mtbf = round(( $total_time_failed / count($mtbf_array))); + $mtrs = round((array_sum($mtrs_array) / count($mtrs_array))); + + $data['mtbf'] = $mtbf; + $data['mtrs'] = $mtrs; + $data['availability'] = $availability; + } + + return $data; +} From 6966ebf96b4c4300d4cd17ee91d8e6510e37e0ca Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Wed, 13 Sep 2023 10:09:05 +0200 Subject: [PATCH 02/10] #11495 Fix service_level_module_data function --- pandora_console/include/functions_modules.php | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index fd8461156c..410cc036f7 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -4768,27 +4768,45 @@ function export_agents_module_csv($filters) * Function to return Mean Time Between Failure, Mean Time To Solution (in seconds) * and Availability of a module * - * @param string $interval_start Start time of the interval. + * @param string $datetime_from Start time of the interval. * - * @param string $interval_end End time of the interval. + * @param string $datetime_to End time of the interval. * * @param string $id_agentmodule id_agentmodule of the module * * @return array Returns an array with the data */ -function service_level_module_data($interval_start, $interval_end, $id_agentmodule) +function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule) { $data = []; $data['mtbf'] = false; $data['mtrs'] = false; $data['availability'] = false; - $interval_time = ($interval_end - $interval_start); + $availability = 0; + + $uncompressed_data = db_uncompress_module_data( + $id_agentmodule, + $datetime_from, + $datetime_to + ); + + $first_utimestamp = 0; + foreach ($uncompressed_data as $data_module) { + foreach ($data_module['data'] as $subdata) { + if (!empty($subdata['datos'])) { + $first_utimestamp = $subdata['utimestamp']; + break; + } + } + } + + $interval_time = ($datetime_to - $datetime_from); $current_time = time(); $sql = 'SELECT utimestamp, event_type FROM tevento WHERE id_agentmodule = '.$id_agentmodule.' - AND utimestamp >= '.$interval_start.' - AND utimestamp <= '.$interval_end.' + AND utimestamp >= '.$datetime_from.' + AND utimestamp <= '.$datetime_to.' ORDER BY utimestamp DESC'; $events_time = db_get_all_rows_sql($sql); @@ -4836,17 +4854,14 @@ function service_level_module_data($interval_start, $interval_end, $id_agentmodu $total_time_failed = array_sum($mtbf_array); $total_time_ok = ($interval_time - $total_time_failed); if (count($events_time) === 1) { - if ($events_time[0]['event_type'] === 'going_up_critical') { - $availability = '0'; - } - - if ($events_time[0]['event_type'] === 'going_down_normal') { - $availability = '100'; + if ((string) $first_utimestamp !== '0') { + $availability = round((($total_time_ok / $interval_time) * 100), 2); } } else { $availability = round((($total_time_ok / $interval_time) * 100), 2); } + // hd($availability, true); $mtbf = round(( $total_time_failed / count($mtbf_array))); $mtrs = round((array_sum($mtrs_array) / count($mtrs_array))); From 8dcace04e7290630474f4daaece400ac19b49f6c Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Wed, 13 Sep 2023 10:10:39 +0200 Subject: [PATCH 03/10] #11495 Add service level detailed report --- .../reporting_builder.item_editor.php | 50 +++++++++++++++++++ pandora_console/include/functions_reports.php | 4 ++ 2 files changed, 54 insertions(+) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 6343fabe1d..53be2c1f07 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -591,6 +591,16 @@ switch ($action) { ); break; + case 'service_level': + $description = $item['description']; + $idAgentModule = $item['id_agent_module']; + $idAgent = db_get_value_filter( + 'id_agente', + 'tagente_modulo', + ['id_agente_modulo' => $idAgentModule] + ); + break; + case 'alert_report_module': $description = $item['description']; $idAgentModule = $item['id_agent_module']; @@ -870,6 +880,25 @@ switch ($action) { $idAgentModule = $module; break; + case 'service_level': + $description = $item['description']; + // Decode agents and modules. + $id_agents = json_decode( + io_safe_output(base64_decode($es['id_agents'])), + true + ); + $module = json_decode( + io_safe_output(base64_decode($es['module'])), + true + ); + + $recursion = $item['recursion']; + + $group = $item['id_group']; + $modulegroup = $item['id_module_group']; + $idAgentModule = $module; + break; + case 'alert_report_actions': $description = $item['description']; $es = json_decode($item['external_source'], true); @@ -1035,6 +1064,7 @@ switch ($action) { case 'sumatory': case 'database_serialized': case 'last_value': + case 'service_level': case 'monitor_report': case 'min_value': case 'max_value': @@ -5367,8 +5397,13 @@ $(document).ready (function () { switch (type){ case 'agent_module': case 'agent_module_status': + case 'service_level': case 'alert_report_actions': var agents_multiple = $('#id_agents2').val(); + if (agents_multiple.length == 0) { + dialog_message('#message_no_agent'); + return false; + } var modules_multiple = $('#module').val(); $('#hidden-id_agents2-multiple-text').val(JSON.stringify(agents_multiple)); $('#hidden-module-multiple-text').val(JSON.stringify(modules_multiple)); @@ -5394,6 +5429,7 @@ $(document).ready (function () { case 'agent_configuration': case 'module_histogram_graph': case 'increment': + case 'service_level': if ($("#hidden-id_agent").val() == 0) { dialog_message('#message_no_agent'); return false; @@ -5508,8 +5544,13 @@ $(document).ready (function () { switch (type){ case 'agent_module': case 'agent_module_status': + case 'service_level': case 'alert_report_actions': var agents_multiple = $('#id_agents2').val(); + if (agents_multiple.length == 0) { + dialog_message('#message_no_agent'); + return false; + } var modules_multiple = $('#module').val(); $('#hidden-id_agents2-multiple-text').val(JSON.stringify(agents_multiple)); $('#hidden-module-multiple-text').val(JSON.stringify(modules_multiple)); @@ -5535,6 +5576,7 @@ $(document).ready (function () { case 'agent_configuration': case 'module_histogram_graph': case 'increment': + case 'service_level': if ($("#hidden-id_agent").val() == 0) { dialog_message('#message_no_agent'); return false; @@ -6946,6 +6988,14 @@ function chooseType() { $("#row_agent").show(); $("#row_module").show(); break; + + case 'service_level': + $("#row_description").show(); + $("#row_group").show(); + $("#select_agent_modules").show(); + $("#agents_modules_row").show(); + $("#modules_row").show(); + break; case 'alert_report_module': $("#row_description").show(); diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index f13e935b6a..a450675cd6 100755 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -777,6 +777,10 @@ function reports_get_report_types($template=false, $not_editor=false) 'optgroup' => __('Modules'), 'name' => __('Last value'), ]; + $types['service_level'] = [ + 'optgroup' => __('Modules'), + 'name' => __('Service Level Detailed'), + ]; $types['general'] = [ 'optgroup' => __('Grouped'), From 355de3b9bd4d451bd2fccfa78315f8d205ac9725 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Wed, 13 Sep 2023 11:41:41 +0200 Subject: [PATCH 04/10] #11495 Fix service level detail function --- pandora_console/include/functions_modules.php | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 410cc036f7..07690151e4 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -4784,6 +4784,7 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule $data['availability'] = false; $availability = 0; + $type = ''; $uncompressed_data = db_uncompress_module_data( $id_agentmodule, @@ -4796,6 +4797,10 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule foreach ($data_module['data'] as $subdata) { if (!empty($subdata['datos'])) { $first_utimestamp = $subdata['utimestamp']; + if (isset($subdata['type'])) { + $type = $subdata['type']; + } + break; } } @@ -4862,8 +4867,19 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule } // hd($availability, true); - $mtbf = round(( $total_time_failed / count($mtbf_array))); - $mtrs = round((array_sum($mtrs_array) / count($mtrs_array))); + if (count($mtbf_array) > 1) { + $mtbf = round(( $total_time_failed / count($mtbf_array))); + } else { + $mtbf = false; + } + + if (count($mtrs_array) === 1 && (string) $first_utimestamp !== '0' && $type === 0) { + $mtrs = round($total_time_failed / count($mtrs_array)); + } else if (count($mtrs_array) > 1 && (string) $first_utimestamp !== '0') { + $mtrs = round((array_sum($mtrs_array) / count($mtrs_array))); + } else { + $mtrs = false; + } $data['mtbf'] = $mtbf; $data['mtrs'] = $mtrs; From 5dcc2704cbd7810ab07584f938adeb8c9b151bd7 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 14 Sep 2023 13:49:56 +0200 Subject: [PATCH 05/10] #11495 Fix service level detailed report --- .../reporting_builder.item_editor.php | 88 +++++++++++++++---- .../godmode/reporting/reporting_builder.php | 32 ++++++- pandora_console/include/functions.php | 26 ++++-- pandora_console/include/functions_modules.php | 78 +++++++++++++++- .../include/functions_reporting.php | 61 +++++++++++++ .../include/functions_reporting_html.php | 81 ++++++++++++++++- 6 files changed, 337 insertions(+), 29 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 53be2c1f07..724c5f6772 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -117,6 +117,8 @@ $exception_condition = REPORT_EXCEPTION_CONDITION_EVERYTHING; $exception_condition_value = 10; $modulegroup = 0; $period = SECONDS_1DAY; +$period_time_service_level = '28800'; +$show_agents = false; $search = ''; $full_text = 0; $log_number = 1000; @@ -591,16 +593,6 @@ switch ($action) { ); break; - case 'service_level': - $description = $item['description']; - $idAgentModule = $item['id_agent_module']; - $idAgent = db_get_value_filter( - 'id_agente', - 'tagente_modulo', - ['id_agente_modulo' => $idAgentModule] - ); - break; - case 'alert_report_module': $description = $item['description']; $idAgentModule = $item['id_agent_module']; @@ -882,6 +874,9 @@ switch ($action) { case 'service_level': $description = $item['description']; + $es = json_decode($item['external_source'], true); + $period_time_service_level = $es['period_time_service_level']; + $show_agents = $es['show_agents']; // Decode agents and modules. $id_agents = json_decode( io_safe_output(base64_decode($es['id_agents'])), @@ -1493,6 +1488,53 @@ if (is_metaconsole() === true) { + + + + + + __('1 week'), + '172800' => __('48 hours'), + '86400' => __('24 hours'), + '43200' => __('12 hours'), + '28800' => __('8 hours'), + + ]; + html_print_select( + $fields_time_service_level, + 'period_time_service_level', + $period_time_service_level, + ); + ?> + + + + + + + + + + + + 0) { - $ret .= "$days days "; + if ($size_text === 'short') { + $ret .= str_replace(' ', '', "$days d").' '; + } else { + $ret .= "$days days "; + } } // get the hours $hours = ((intval($seconds) / 360000) % 24); if ($hours > 0) { - $ret .= "$hours hours "; + if ($size_text === 'short') { + $ret .= str_replace(' ', '', "$hours h").' '; + } else { + $ret .= "$hours hours "; + } } // get the minutes $minutes = ((intval($seconds) / 6000) % 60); if ($minutes > 0) { - $ret .= "$minutes minutes "; + if ($size_text === 'short') { + $ret .= str_replace(' ', '', "$minutes m").' '; + } else { + $ret .= "$minutes minutes "; + } } // get the seconds $seconds = ((intval($seconds) / 100) % 60); if ($seconds > 0) { - $ret .= "$seconds seconds"; + if ($size_text === 'short') { + $ret .= str_replace(' ', '', "$seconds s").' '; + } else { + $ret .= "$seconds seconds "; + } } return $ret; diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 07690151e4..a953d66ac1 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -4782,10 +4782,29 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule $data['mtbf'] = false; $data['mtrs'] = false; $data['availability'] = false; + $data['critical_events'] = false; + $data['warning_events'] = false; + $data['last_status_change'] = false; + $data['module_name'] = false; $availability = 0; $type = ''; + if ((bool) is_metaconsole() === true) { + if (enterprise_include_once('include/functions_metaconsole.php') !== ENTERPRISE_NOT_HOOK) { + $server_id = []; + $server_id['id'] = explode('|', $id_agentmodule)[0]; + $id_agentmodule = explode('|', $id_agentmodule)[1]; + $server_name = db_get_row_filter('tmetaconsole_setup', $server_id, 'server_name'); + $connection = metaconsole_get_connection($server_name); + if (metaconsole_load_external_db($connection) !== NOERR) { + // Restore db connection. + metaconsole_restore_db(); + return $data; + } + } + } + $uncompressed_data = db_uncompress_module_data( $id_agentmodule, $datetime_from, @@ -4815,6 +4834,24 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule ORDER BY utimestamp DESC'; $events_time = db_get_all_rows_sql($sql); + + // Count events. + $sql = 'SELECT COUNT(*) as critical_events FROM tevento + WHERE id_agentmodule= '.$id_agentmodule.' + AND utimestamp >= '.$datetime_from.' + AND utimestamp <= '.$datetime_to.' + AND (event_type = "going_up_critical" OR event_type = "going_down_critical")'; + + $critical_events = db_get_sql($sql); + + $sql = 'SELECT COUNT(*) as warning_events FROM tevento + WHERE id_agentmodule= '.$id_agentmodule.' + AND utimestamp >= '.$datetime_from.' + AND utimestamp <= '.$datetime_to.' + AND (event_type = "going_up_warning" OR event_type = "going_down_warning")'; + + $warning_events = db_get_sql($sql); + if ($events_time !== false && count($events_time) > 0) { $failed_event = []; $normal_event = []; @@ -4844,6 +4881,7 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule } $mtbf_array = []; + if (!empty($failed_event) === true) { if (count($failed_event) > 1) { for ($i = 1; $i <= array_key_last($failed_event); $i++) { @@ -4866,9 +4904,8 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule $availability = round((($total_time_ok / $interval_time) * 100), 2); } - // hd($availability, true); - if (count($mtbf_array) > 1) { - $mtbf = round(( $total_time_failed / count($mtbf_array))); + if ($critical_events > 1) { + $mtbf = round(( $total_time_failed / $critical_events)); } else { $mtbf = false; } @@ -4884,6 +4921,41 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule $data['mtbf'] = $mtbf; $data['mtrs'] = $mtrs; $data['availability'] = $availability; + } else { + $data['mtbf'] = false; + $data['mtrs'] = false; + $data['availability'] = false; + } + + // Get last status change. + $sql = 'SELECT last_status_change FROM tagente_estado + WHERE id_agente_modulo = '.$id_agentmodule.' '; + + $last_status_change = db_get_sql($sql); + + // Get module name. + /* + $sql = 'SELECT nombre FROM tagente_modulo + WHERE id_agente_modulo = '.$id_agentmodule;*/ + + $sql = 'SELECT tagente_modulo.nombre as nombre, tagente.alias as alias + FROM tagente_modulo INNER JOIN tagente + ON tagente_modulo.id_agente = tagente.id_agente + WHERE id_agente_modulo = '.$id_agentmodule.' '; + $sql_query = db_get_all_rows_sql($sql); + + $data['critical_events'] = $critical_events; + $data['warning_events'] = $warning_events; + $data['last_status_change'] = $last_status_change; + $data['module_name'] = $sql_query[0]['nombre']; + if ((bool) is_metaconsole() === true) { + $data['agent_alias'] = $server_name['server_name'].' ยป '.$sql_query[0]['alias']; + } else { + $data['agent_alias'] = $sql_query[0]['alias']; + } + + if ((bool) is_metaconsole() === true) { + metaconsole_restore_db(); } return $data; diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index ee1f04b952..94585ee455 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -778,6 +778,13 @@ function reporting_make_reporting_data( ); break; + case 'service_level': + $report['contents'][] = reporting_service_level_detail( + $report, + $content + ); + break; + case 'alert_report_actions': $report['contents'][] = reporting_alert_report_actions( $report, @@ -3567,6 +3574,60 @@ function reporting_agent_module_status($report, $content) } +/** + * Service level detail + * + * @param array $report Info Report. + * @param array $content Info content. + * + * @return array + */ +function reporting_service_level_detail($report, $content) +{ + global $config; + $return['type'] = 'service_level'; + + $module_data = []; + $interval_range = []; + $service_level_data = []; + $current_timestamp = time(); + + $return['title'] = io_safe_output($content['name']); + $return['landscape'] = $content['landscape']; + $return['pagebreak'] = $content['pagebreak']; + + $return['description'] = io_safe_output($content['description']); + $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : ''; + $es = json_decode($content['external_source'], true); + $return['date'] = []; + $return['date']['date'] = false; + $return['date']['period'] = $es['period_time_service_level']; + $return['show_agents'] = $es['show_agents']; + + $modules = json_decode(base64_decode($es['module']), true); + $agents = json_decode(base64_decode($es['id_agents']), true); + $interval_range['start'] = ($current_timestamp - $es['period_time_service_level']); + $interval_range['end'] = $current_timestamp; + + foreach ($modules as $module) { + $service_level_data = service_level_module_data($interval_range['start'], $interval_range['end'], $module); + $module_data[$module] = []; + $module_data[$module]['mtrs'] = ($service_level_data['mtrs'] !== false) ? human_milliseconds_to_string(($service_level_data['mtrs'] * 100), 'short') : '-'; + $module_data[$module]['mtbf'] = ($service_level_data['mtbf'] !== false) ? human_milliseconds_to_string(($service_level_data['mtbf'] * 100), 'short') : '-'; + $module_data[$module]['availability'] = ($service_level_data['availability'] !== false) ? $service_level_data['availability'] : '100'; + $module_data[$module]['warning_events'] = ($service_level_data['warning_events'] !== false) ? $service_level_data['warning_events'] : '0'; + $module_data[$module]['critical_events'] = ($service_level_data['critical_events'] !== false) ? $service_level_data['critical_events'] : '0'; + $module_data[$module]['last_status_change'] = ($service_level_data['last_status_change'] !== false) ? $service_level_data['last_status_change'] : ''; + $module_data[$module]['module_name'] = ($service_level_data['module_name'] !== false) ? $service_level_data['module_name'] : ''; + $module_data[$module]['agent_alias'] = ($service_level_data['agent_alias'] !== false) ? $service_level_data['agent_alias'] : ''; + } + + $return['data'] = $module_data; + + return reporting_check_structure_content($return); +} + + function reporting_exception( $report, $content, diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 719ddfd7a3..cd5e1b5e23 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -260,7 +260,6 @@ function reporting_html_print_report($report, $mini=false, $report_info=1, $cust } $table->colspan['description_row']['description'] = 3; - switch ($item['type']) { case 'availability': default: @@ -403,6 +402,10 @@ function reporting_html_print_report($report, $mini=false, $report_info=1, $cust reporting_html_agent_module_status($table, $item); break; + case 'service_level': + reporting_html_service_level($table, $item); + break; + case 'alert_report_actions': reporting_html_alert_report_actions($table, $item); break; @@ -2452,6 +2455,82 @@ function reporting_html_agent_module_status($table, $item, $pdf=0) } +function reporting_html_service_level($table, $item, $pdf=0) +{ + global $config; + + $return_pdf = ''; + + if (empty($item['data']) === true) { + if ($pdf !== 0) { + $return_pdf .= __('No items'); + } else { + $table->colspan['group_report']['cell'] = 3; + $table->cellstyle['group_report']['cell'] = 'text-align: center;'; + $table->data['group_report']['cell'] = __('No items'); + } + } else { + $table_info = new stdClass(); + $table_info->width = '99%'; + if ($item['show_agents'] === '1') { + $show_agents = 'on'; + } else { + $show_agents = 'off'; + } + + if ($show_agents === 'on') { + $table_info->head[0] = __('Agent / Module'); + } else { + $table_info->head[0] = __('Module'); + } + + $table_info->head[1] = __('% Av.'); + $table_info->head[2] = __('MTBF'); + $table_info->head[3] = __('MTRS'); + $table_info->head[4] = __('Crit. Events'); + $table_info->head[5] = __('Warn. Events'); + $table_info->head[6] = __('Last change'); + $table_info->data = []; + $row = 0; + + foreach ($item['data'] as $agentmodule_id => $module_data) { + if ($show_agents === 'on') { + $table_info->data[$row][0] = $module_data['agent_alias'].' / '.$module_data['module_name']; + } else { + $table_info->data[$row][0] = $module_data['module_name']; + } + + $table_info->data[$row][1] = $module_data['availability'].'%'; + $table_info->data[$row][2] = $module_data['mtbf']; + $table_info->data[$row][3] = $module_data['mtrs']; + $table_info->data[$row][4] = $module_data['critical_events']; + $table_info->data[$row][5] = $module_data['warning_events']; + if ($module_data['last_status_change'] !== '') { + $table_info->data[$row][6] = date(TIME_FORMAT, $module_data['last_status_change']); + } + + // $table_info->data[$row][6] = date(TIME_FORMAT, $module_data['last_status_change']); + $row++; + } + + if ($pdf !== 0) { + $table_info->title = $item['title']; + $table_info->titleclass = 'title_table_pdf'; + $table_info->titlestyle = 'text-align:left;'; + $return_pdf .= html_print_table($table_info, true); + } else { + $table->colspan['data']['cell'] = 3; + $table->cellstyle['data']['cell'] = 'text-align: center;'; + $table->data['data']['cell'] = html_print_table($table_info, true); + } + } + + if ($pdf !== 0) { + return $return_pdf; + } +} + + /** * Function to print to HTML Exception report. * From 51e07930ed16d37bdb246c6a42266dccae54f00a Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 23 Nov 2023 09:51:12 +0100 Subject: [PATCH 06/10] #11495 Align text left --- pandora_console/include/functions_reporting_html.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 71bf7afbc3..e67bd2b173 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -2797,13 +2797,16 @@ function reporting_html_service_level($table, $item, $pdf=0) $table_info->head[5] = __('Warn. Events'); $table_info->head[6] = __('Last change'); $table_info->data = []; + $table_info->cellstyle = []; $row = 0; foreach ($item['data'] as $agentmodule_id => $module_data) { if ($show_agents === 'on') { $table_info->data[$row][0] = $module_data['agent_alias'].' / '.$module_data['module_name']; + $table_info->cellstyle[$row][0] = 'text-align:left; padding-left: 30px;'; } else { $table_info->data[$row][0] = $module_data['module_name']; + $table_info->cellstyle[$row][0] = 'text-align:left; padding-left: 30px;'; } $table_info->data[$row][1] = $module_data['availability'].'%'; From 63945df5fdfbd7263fc33bbe94e2e27e974df8e6 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Wed, 29 Nov 2023 09:44:25 +0100 Subject: [PATCH 07/10] #11495 Add tip and fix MTRS bug --- pandora_console/include/functions_modules.php | 4 ++++ pandora_console/include/functions_reporting_html.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 52ce97df12..c3a1eb1ff4 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -4872,6 +4872,10 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule $mtrs_array[] = 0; } else { foreach ($normal_event as $key => $value) { + if (isset($failed_event[$key]) === false) { + $failed_event[$key] = end($failed_event); + } + if (($failed_event[$key] - $normal_event[$key]) < 0) { $mtrs_array[] = ($normal_event[$key] - $failed_event[$key]); } else { diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index e67bd2b173..e7eef0ae46 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -2793,8 +2793,8 @@ function reporting_html_service_level($table, $item, $pdf=0) $table_info->head[1] = __('% Av.'); $table_info->head[2] = __('MTBF'); $table_info->head[3] = __('MTRS'); - $table_info->head[4] = __('Crit. Events'); - $table_info->head[5] = __('Warn. Events'); + $table_info->head[4] = __('Crit. Events').ui_print_help_tip(__('Counted only critical events generated automatic by the module'), true); + $table_info->head[5] = __('Warn. Events').ui_print_help_tip(__('Counted only warning events generated automatic by the module'), true); $table_info->head[6] = __('Last change'); $table_info->data = []; $table_info->cellstyle = []; From d034116dd31cbe9f3ac4ace193a145ecd4b71f90 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 11 Dec 2023 09:26:57 +0100 Subject: [PATCH 08/10] #11495 Fix report --- .../include/ajax/reporting.ajax.php | 2 +- pandora_console/include/functions_modules.php | 60 +++++++++++++------ 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/pandora_console/include/ajax/reporting.ajax.php b/pandora_console/include/ajax/reporting.ajax.php index 59469a16e3..5f83d79b88 100755 --- a/pandora_console/include/ajax/reporting.ajax.php +++ b/pandora_console/include/ajax/reporting.ajax.php @@ -251,7 +251,7 @@ if ($change_custom_fields_macros_report === true) { } if ($get_agents === true) { - $agents_id = str_replace('"', '', $agents_id); + $agents_id = str_replace('"', '"', $agents_id); try { $agents_id = json_decode($agents_id, true); diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index c759187e21..ea776d6fe3 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -4794,7 +4794,6 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule $availability = 0; $type = ''; - if ((bool) is_metaconsole() === true) { if (enterprise_include_once('include/functions_metaconsole.php') !== ENTERPRISE_NOT_HOOK) { $server_id = []; @@ -4860,13 +4859,33 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule if ($events_time !== false && count($events_time) > 0) { $failed_event = []; $normal_event = []; - foreach ($events_time as $event) { - if ($event['event_type'] === 'going_up_critical') { + $events_time = array_reverse($events_time); + $mtrs_events = []; + foreach ($events_time as $key => $event) { + if ($event['event_type'] === 'going_up_critical' || $event['event_type'] === 'going_down_critical') { $failed_event[] = $event['utimestamp']; + $mtrs_events[]['failed_event'] = $event['utimestamp']; } - if ($event['event_type'] === 'going_down_normal') { + if ($event['event_type'] === 'going_up_normal' + || $event['event_type'] === 'going_down_normal' + || $event['event_type'] === 'going_up_warning' + || $event['event_type'] === 'going_down_warning' + ) { $normal_event[] = $event['utimestamp']; + $mtrs_events[]['normal_event'] = $event['utimestamp']; + } + } + + $process_mtrs_events = []; + + if (empty($mtrs_events) === false) { + $last_event_key = ''; + foreach ($mtrs_events as $key => $val) { + if (key($val) !== $last_event_key) { + $last_event_key = key($val); + $process_mtrs_events[] = $val; + } } } @@ -4876,16 +4895,19 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule } else if (empty($failed_event) === true) { $mtrs_array[] = 0; } else { - foreach ($normal_event as $key => $value) { - if (isset($failed_event[$key]) === false) { - $failed_event[$key] = end($failed_event); + $last_value = ''; + foreach ($process_mtrs_events as $key => $val) { + $current_value = $val[key($val)]; + if ($last_value !== '') { + $mtrs_array[] = ($current_value - $last_value); } - if (($failed_event[$key] - $normal_event[$key]) < 0) { - $mtrs_array[] = ($normal_event[$key] - $failed_event[$key]); - } else { - $mtrs_array[] = ($failed_event[$key] - $normal_event[$key]); - } + $last_value = $current_value; + } + + $last_mtrs_event = key(end($process_mtrs_events)); + if ($last_mtrs_event === 'failed_event') { + $mtrs_array[] = ($current_time - $last_value); } } @@ -4894,19 +4916,19 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule if (!empty($failed_event) === true) { if (count($failed_event) > 1) { for ($i = 1; $i <= array_key_last($failed_event); $i++) { - $mtbf_array[] = ($failed_event[($i - 1)] - $failed_event[$i]); + $mtbf_array[] = ($failed_event[$i] - ($failed_event[($i - 1)])); } } else { - $mtbf_array[] = ($current_time - $failed_event[0]); + $mtbf_array[] = 0; } } else { $mtbf_array[] = 0; } - $total_time_failed = array_sum($mtbf_array); + $total_time_failed = array_sum($mtrs_array); $total_time_ok = ($interval_time - $total_time_failed); if (count($events_time) === 1) { - if ((string) $first_utimestamp !== '0') { + if ((int) $first_utimestamp !== 0) { $availability = round((($total_time_ok / $interval_time) * 100), 2); } } else { @@ -4914,14 +4936,14 @@ function service_level_module_data($datetime_from, $datetime_to, $id_agentmodule } if ($critical_events > 1) { - $mtbf = round(( $total_time_failed / $critical_events)); + $mtbf = round(array_sum($mtbf_array) / count($mtbf_array)); } else { $mtbf = false; } - if (count($mtrs_array) === 1 && (string) $first_utimestamp !== '0' && $type === 0) { + if (count($mtrs_array) === 1 && (int) $first_utimestamp !== 0) { $mtrs = round($total_time_failed / count($mtrs_array)); - } else if (count($mtrs_array) > 1 && (string) $first_utimestamp !== '0') { + } else if (count($mtrs_array) > 1 && (int) $first_utimestamp !== 0) { $mtrs = round((array_sum($mtrs_array) / count($mtrs_array))); } else { $mtrs = false; From 94256559f1de1a32ceef0de36473dee843a4bd4e Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 11 Dec 2023 16:46:19 +0100 Subject: [PATCH 09/10] #11495 Fix agent name in metaconsole module selector --- .../reporting/reporting_builder.item_editor.php | 2 +- pandora_console/include/functions_agents.php | 4 ++-- pandora_console/include/functions_modules.php | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index c9fa71860c..06652894ca 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -2335,7 +2335,7 @@ if (is_metaconsole() === true) { $modulegroup, $id_agents, !$selection_a_m, - false + true ); } diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 2d6803ccd4..3f9bd48955 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -3664,7 +3664,7 @@ function select_modules_for_agent_group( $sql = "SELECT * FROM ( - SELECT DISTINCT(tagente_modulo.id_agente_modulo), tagente_modulo.nombre + SELECT (tagente_modulo.id_agente_modulo), tagente_modulo.nombre, tagente.alias FROM tagente_modulo $sql_tags_inner INNER JOIN tagente @@ -3679,7 +3679,7 @@ function select_modules_for_agent_group( $filter_not_string_modules $sql_conditions_tags ) x - GROUP BY nombre + $selection_filter"; $modules = db_get_all_rows_sql($sql); diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index ea776d6fe3..2955cdd4f7 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -3774,9 +3774,15 @@ function get_modules_agents( $t['id_node'] = $tserver; if ($nodes[$tserver] !== null) { - $t['nombre'] = io_safe_output( - $nodes[$tserver]->server_name().' » '.$t['nombre'] - ); + if (isset($t['alias']) === true) { + $t['nombre'] = io_safe_output( + $nodes[$tserver]->server_name().' » '.$t['alias'].' » '.$t['nombre'] + ); + } else { + $t['nombre'] = io_safe_output( + $nodes[$tserver]->server_name().' » '.$t['nombre'] + ); + } } $carry[] = $t; From 77fd03d58a58d216bfa320502fb583c13aabef16 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 12 Dec 2023 10:15:37 +0100 Subject: [PATCH 10/10] #11495 Fix agent name in module selection --- pandora_console/include/functions_agents.php | 2 +- pandora_console/include/functions_modules.php | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 3f9bd48955..aa122b292f 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -3643,7 +3643,7 @@ function select_modules_for_agent_group( if (!$selection && $agents != null) { $number_agents = count($id_agents); - $selection_filter = "HAVING COUNT(id_agente_modulo) = $number_agents"; + $selection_filter = "GROUP BY nombre HAVING COUNT(id_agente_modulo) = $number_agents"; } if (tags_has_user_acl_tags(false)) { diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 019f92d4e1..b5cf42d894 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -3801,7 +3801,7 @@ function get_modules_agents( $return = array_reduce( $modules[$tserver], - function ($carry, $item) use ($tserver, $nodes) { + function ($carry, $item) use ($tserver, $nodes, $selection) { $t = []; foreach ($item as $k => $v) { $t[$k] = $v; @@ -3809,7 +3809,7 @@ function get_modules_agents( $t['id_node'] = $tserver; if ($nodes[$tserver] !== null) { - if (isset($t['alias']) === true) { + if (isset($t['alias']) === true && (bool) $selection === true) { $t['nombre'] = io_safe_output( $nodes[$tserver]->server_name().' » '.$t['alias'].' » '.$t['nombre'] ); @@ -3851,9 +3851,23 @@ function get_modules_agents( $selection, false, $useName, - false, + true, $notStringModules ); + + $modules = array_reduce( + $modules, + function ($carry, $item) use ($id_agents, $selection) { + if (count($id_agents) > 1 && (bool) $selection === true) { + $carry[$item['id_agente_modulo']] = $item['alias'].' » '.$item['nombre']; + } else { + $carry[$item['id_agente_modulo']] = $item['nombre']; + } + + return $carry; + }, + [] + ); } return $modules;