From 62c7ac463d8e100f4d0df69dee27bb53573e9f97 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 30 Mar 2015 17:07:57 +0200 Subject: [PATCH] Working in the refactoring the code of reports (agent_configuration). --- .../include/functions_reporting.php | 112 +++++++++ .../include/functions_reporting_html.php | 228 +++++++----------- 2 files changed, 203 insertions(+), 137 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 43e29667d9..db326bada3 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -36,6 +36,7 @@ enterprise_include_once('include/functions_inventory.php'); include_once($config['homedir'] . "/include/functions_forecast.php"); include_once($config['homedir'] . "/include/functions_ui.php"); include_once($config['homedir'] . "/include/functions_netflow.php"); +include_once($config['homedir'] . "/include/functions_os.php"); function reporting_user_can_see_report($id_report, $id_user = null) { global $config; @@ -122,6 +123,7 @@ function reporting_make_reporting_data($id_report, $date, $time, return $return; } + $report["group"] = $report['id_group']; $report["group_name"] = groups_get_name ($report['id_group']); $datetime = strtotime($date . ' ' . $time); @@ -227,12 +229,122 @@ function reporting_make_reporting_data($id_report, $date, $time, $content, 'TTRT'); break; + case 'agent_configuration': + $report['contents'][] = reporting_agent_configuration( + $report, + $content); + break; } } return reporting_check_structure_report($report); } +function reporting_agent_configuration($report, $content) { + global $config; + + $return['type'] = 'agent_configuration'; + + if (empty($content['name'])) { + $content['name'] = __('Agent configuration'); + } + + $return['title'] = $content['name']; + $return["description"] = $content["description"]; + $return["date"] = reporting_get_date_text($report, $content); + + + $sql = " + SELECT * + FROM tagente + WHERE id_agente=" . $content['id_agent']; + $agent_data = db_get_row_sql($sql); + + $agent_configuration = array(); + $agent_configuration['name'] = $agent_data['nombre']; + $agent_configuration['group'] = groups_get_name($agent_data['id_grupo']); + $agent_configuration['group_icon'] = + ui_print_group_icon ($agent_data['id_grupo'], true, '', '', false); + $agent_configuration['os'] = os_get_name($agent_data["id_os"]); + $agent_configuration['os_icon'] = ui_print_os_icon($agent_data["id_os"], true, true); + $agent_configuration['address'] = $agent_data['direccion']; + $agent_configuration['description'] = + strip_tags(ui_bbcode_to_html($agent_data['comentarios'])); + $agent_configuration['enabled'] = (int)!$agent_data['disabled']; + $agent_configuration['group'] = $report["group"]; + + $modules = agents_get_modules ($content['id_agent']); + + $agent_configuration['modules'] = array(); + //Agent's modules + if (!empty($modules)) { + foreach ($modules as $id_agent_module => $module) { + $sql = " + SELECT * + FROM tagente_modulo + WHERE id_agente_modulo = $id_agent_module"; + $module_db = db_get_row_sql($sql); + + + $data_module = array(); + $data_module['name'] = $module_db['nombre']; + if ($module_db['disabled']) { + $data_module['name'] .= " (" . __('Disabled') . ")"; + } + $data_module['type_icon'] = + ui_print_moduletype_icon($module_db['id_tipo_modulo'], true); + $data_module['type'] = + modules_get_type_name($module_db['id_tipo_modulo']); + $data_module['max_warning'] = + $module_db['max_warning']; + $data_module['min_warning'] = + $module_db['min_warning']; + $data_module['max_critical'] = + $module_db['max_critical']; + $data_module['min_critical'] = + $module_db['min_critical']; + $data_module['threshold'] = $module_db['module_ff_interval']; + $data_module['description'] = $module_db['descripcion']; + if (($module_db['module_interval'] == 0) || + ($module_db['module_interval'] == '')) { + + $data_module['interval'] = db_get_value('intervalo', + 'tagente', 'id_agente', $content['id_agent']); + } + else { + $data_module['interval'] = $module_db['module_interval']; + } + $data_module['unit'] = $module_db['unit']; + $module_status = db_get_row( + 'tagente_estado', 'id_agente_modulo', $id_agent_module); + modules_get_status($id_agent_module, + $module_status['estado'], + $module_status['datos'], $status, $title); + $data_module['status_icon'] = + ui_print_status_image($status, $title, true); + $data_module['status'] = $title; + $sql_tag = " + SELECT name + FROM ttag + WHERE id_tag IN ( + SELECT id_tag + FROM ttag_module + WHERE id_agente_modulo = $id_agent_module)"; + $tags = db_get_all_rows_sql($sql_tag); + if ($tags === false) + $data_module['tags'] = array(); + else + $data_module['tags'] = $tags; + + $agent_configuration['modules'][] = $data_module; + } + } + + $return['data'] = $agent_configuration; + + return reporting_check_structure_content($return); +} + function reporting_value($report, $content, $type) { global $config; diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 33536abdae..207d7499a6 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -167,6 +167,9 @@ function reporting_html_print_report($report, $mini = false) { case 'TTRT': reporting_html_TTRT_value($table, $item, $mini, false, true); break; + case 'agent_configuration': + reporting_html_agent_configuration($table, $item); + break; } if ($item['type'] == 'agent_module') @@ -179,6 +182,91 @@ function reporting_html_print_report($report, $mini = false) { } } +function reporting_html_agent_configuration(&$table, $item) { + $table->colspan['agent']['cell'] = 3; + $table->cellstyle['agent']['cell'] = 'text-align: left;'; + + $table1->width = '99%'; + $table1->head = array (); + $table1->head['name'] = __('Agent name'); + $table1->head['group'] = __('Group'); + $table1->head['os'] = __('OS'); + $table1->head['address'] = __('IP'); + $table1->head['description'] = __('Description'); + $table1->head['status'] = __('Status'); + $table1->data = array (); + $row = array(); + $row['name'] = $item['data']['name']; + $row['group'] = $item['data']['group_icon']; + $row['address'] = $item['data']['os_icon']; + $row['os'] = $item['data']['address']; + $row['description'] = $item['data']['description']; + if ($item['data']['enabled']) { + $row['status'] = __('Enabled'); + } + else { + $row['status'] = __('Disabled'); + } + $table1->data[] = $row; + $table->data['agent']['cell'] = html_print_table($table1, true); + + + $table->colspan['modules']['cell'] = 3; + $table->cellstyle['modules']['cell'] = 'text-align: left;'; + + if (empty($item['data']['modules'])) { + $table->data['modules']['cell'] = __('Empty modules'); + } + else { + $table1->width = '99%'; + $table1->head = array (); + $table1->head['name'] = __('Name'); + $table1->head['type'] = __('Type'); + $table1->head['warning_critical'] = __('Warning
Critical'); + $table1->head['threshold'] = __('Threshold'); + $table1->head['group_icon'] = __('Group'); + $table1->head['description'] = __('Description'); + $table1->head['interval'] = __('Interval'); + $table1->head['unit'] = __('Unit'); + $table1->head['status'] = __('Status'); + $table1->head['tags'] = __('Tags'); + $table1->align = array(); + $table1->align['name'] = 'left'; + $table1->align['type'] = 'center'; + $table1->align['warning_critical'] = 'right'; + $table1->align['threshold'] = 'right'; + $table1->align['group_icon'] = 'center'; + $table1->align['description'] = 'left'; + $table1->align['interval'] = 'right'; + $table1->align['unit'] = 'left'; + $table1->align['status'] = 'center'; + $table1->align['tags'] = 'left'; + $table1->data = array (); + + foreach ($item['data']['modules'] as $module) { + $row = array(); + + $row['name'] = $module['name']; + $row['type'] = $module['type_icon']; + $row['warning_critical'] = + $module['max_warning'] . " / " . $module['min_warning'] . + "
" . + $module['max_critical'] . " / " . $module['min_critical']; + $row['threshold'] = $module['threshold']; + $row['group_icon'] = ui_print_group_icon($item['data']['group'], true); + $row['description'] = $module['description']; + $row['interval'] = $module['interval']; + $row['unit'] = $module['unit']; + $row['status'] = $module['status_icon']; + $row['tags'] = implode(",", $module['tags']); + + $table1->data[] = $row; + } + + $table->data['modules']['cell'] = html_print_table($table1, true); + } +} + function reporting_html_TTO_value(&$table, $item, $mini, $only_value = false, $check_empty = false) { reporting_html_value($table, $item, $mini); } @@ -204,7 +292,7 @@ function reporting_html_max_value(&$table, $item, $mini) { } function reporting_html_min_value(&$table, $item, $mini) { - reporting_html_value($table, $item, $mini, $only_value, $check_empty); + reporting_html_value($table, $item, $mini); } function reporting_html_value(&$table, $item, $mini, $only_value = false, $check_empty = false) { @@ -5507,142 +5595,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f array_push ($table->data, $data); break; - case 'agent_configuration': - - if (empty($item_title)) { - $item_title = __('Agent configuration: ').$agent_name; - } - reporting_header_content($mini, $content, $report, $table, $item_title); - - $agent_name = agents_get_name ($content['id_agent']); - $modules = agents_get_modules ($content['id_agent']); - - $data= array (); - $table->colspan[0][1] = 10; - - //Agent's data - $data[0] = ''.__('Agent name').''; - $data[1] = ''.__('Group').''; - $data[2] = ''.__('SO').''; - $data[3] = ''.__('IP').''; - $data[4] = ''.__('Description').''; - $data[5] = ''.__('Status').''; - - $table->colspan[1][3] = 2; - $table->colspan[1][4] = 4; - $table->colspan[1][5] = 2; - $table->colspan[1][5] = 2; - array_push ($table->data, $data); - unset($data); - - $sql = "SELECT * FROM tagente WHERE id_agente=".$content['id_agent']; - $agent_data = db_get_row_sql($sql); - - $data[0] = $agent_data['nombre']; - $data[1] = ui_print_group_icon ($agent_data['id_grupo'], true, '', '', false); - $data[2] = ui_print_os_icon ($agent_data["id_os"], true, true); - $data[3] = $agent_data['direccion']; - $agent_data_comentarios = strip_tags(ui_bbcode_to_html($agent_data['comentarios'])); - $data[4] = $agent_data_comentarios; - - if ($agent_data['disabled'] == 0) - $data[5] = __('Enabled'); - else - $data[5] = __('Disabled'); - - $table->colspan[2][3] = 2; - $table->colspan[2][4] = 4; - $table->colspan[2][5] = 2; - array_push ($table->data, $data); - unset($data); - - //Agent's modules - if ($modules == null) { - $modules = array(); - } - else { - $data[0] = ''; - $data[1] = ''.agents_get_name ($content['id_agent'], 'upper').__(' MODULES').''; - $table->colspan[3][1] = 10; - - array_push ($table->data, $data); - unset($data); - - $data[0] = ''; - $data[1] = ''.__('Name').''; - $data[2] = ''.__('Type').''; - $data[3] = ''.__('Warning').'/'.'
'.__('Critical').''; - $data[4] = ''.__('Threshold').''; - $data[5] = ''.__('Group').''; - $data[6] = ''.__('Description').''; - $data[7] = ''.__('Interval').''; - $data[8] = ''.__('Unit').''; - $data[9] = ''.__('Status').''; - $data[10] = ''.__('Tags').''; - - $table->style[0] = 'width:10px'; - $table->style[1] = 'text-align: left'; - $table->style[2] = 'text-align: center'; - $table->style[3] = 'text-align: center'; - $table->style[4] = 'text-align: center'; - $table->style[5] = 'text-align: center'; - $table->style[6] = 'text-align: left'; - $table->style[7] = 'text-align: center'; - $table->style[8] = 'text-align: center'; - $table->style[9] = 'text-align: left'; - $table->style[10] = 'text-align: left'; - - array_push ($table->data, $data); - } - - foreach ($modules as $id_agent_module=>$module) { - $sql = "SELECT * FROM tagente_modulo WHERE id_agente_modulo=$id_agent_module"; - $data_module = db_get_row_sql($sql); - - $data = array(); - - $data[0] = ''; - - if ($data_module['disabled'] == 0) - $disabled = ''; - else - $disabled = ' (Disabled)'; - $data[1] = $data_module['nombre'].$disabled; - $data[2] = ui_print_moduletype_icon ($data_module['id_tipo_modulo'], true); - $data[3] = $data_module['max_warning'].'/'.$data_module['min_warning'].'
'.$data_module['max_critical'].'/'.$data_module['min_critical']; - $data[4] = $data_module['module_ff_interval']; - $data[5] = groups_get_name ($content['id_group'], true); - $data[6] = $data_module['descripcion']; - - if (($data_module['module_interval'] == 0) || ($data_module['module_interval'] == '')) - $data[7] = db_get_value('intervalo', 'tagente', 'id_agente', $content['id_agent']); - else - $data[7] = $data_module['module_interval']; - - - $data[8] = $data_module['unit']; - - $module_status = db_get_row('tagente_estado', 'id_agente_modulo', $id_agent_module); - modules_get_status($id_agent_module, $module_status['estado'], $module_status['datos'], $status, $title); - $data[9] = ui_print_status_image($status, $title, true); - - $sql_tag = "SELECT name - FROM ttag - WHERE id_tag IN ( - SELECT id_tag - FROM ttag_module - WHERE id_agente_modulo = $id_agent_module)"; - $tags = db_get_all_rows_sql($sql_tag); - if ($tags === false) - $tags = ''; - else - $tags = implode (",", $tags); - - $data[10] = $tags; - array_push ($table->data, $data); - } - - break; + + case 'group_configuration': $group_name = groups_get_name($content['id_group']); if (empty($item_title)) {