@@ -2279,7 +2422,7 @@ if (is_metaconsole() === true) {
$modulegroup,
$id_agents,
!$selection_a_m,
- false
+ true
);
}
@@ -5999,8 +6142,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));
@@ -6026,6 +6174,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;
@@ -6186,8 +6335,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));
@@ -6213,6 +6367,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;
@@ -7208,6 +7363,9 @@ function chooseType() {
$("#row_agent").hide();
$("#row_module").hide();
$("#row_search").hide();
+ $("#row_period").hide();
+ $("#row_period_service_level").hide();
+ $("#row_show_agents").hide();
$("#row_log_number").hide();
$("#row_period1").hide();
$("#row_period2").hide();
@@ -7362,6 +7520,10 @@ function chooseType() {
$('#agent_autocomplete_events').show();
+ // NCM fields.
+ $("#row_ncm_group").hide();
+ $("#row_ncm_agent").hide();
+
switch (type) {
case 'event_report_group':
$("#row_description").show();
@@ -7922,6 +8084,22 @@ function chooseType() {
}
$("#row_historical_db_check").hide();
break;
+
+ case 'service_level':
+ $("#row_period_service_level").show();
+ $("#row_show_agents").show();
+ $("#row_description").show();
+ $("#row_group").show();
+ $("#select_agent_modules").show();
+ $("#agents_modules_row").show();
+ $("#modules_row").show();
+ $("#row_historical_db_check").hide();
+ loadGeneralAgents();
+ $("#combo_group").change(function() {
+ loadGeneralAgents($(this).val());
+ });
+ $("#row_module_group").show();
+ break;
case 'agent_module':
$("#row_module_group").show();
@@ -8220,7 +8398,13 @@ function chooseType() {
break;
case 'ncm':
- $("#row_agent").show();
+ $("#row_ncm_group").show();
+ $("#row_ncm_agent").show();
+ break;
+
+ case 'ncm_backups':
+ $("#row_ncm_group").show();
+ $("#row_ncm_agent").show();
break;
case 'top_n_agents_sh':
@@ -8603,4 +8787,43 @@ $(document).ready(function () {
});
});
+// Ncm agent filter by group.
+function filterNcmAgentChange() {
+ var idGroup = $("#ncm_group").val();
+ const url_ajax = $("#url_ajax").val();
+
+ $.ajax({
+ url: url_ajax,
+ type: "POST",
+ dataType: "json",
+ async: false,
+ data: {
+ page: "operation/agentes/ver_agente",
+ get_ncm_agents: 1,
+ id_group: idGroup,
+ privilege: "AW",
+ keys_prefix: "_"
+ },
+ success: function(data) {
+ $("#agent_ncm").empty();
+ var optionAny = $("'.__('Mail configuration').' ';
echo '';
+ echo '';
+ echo ''.__('NCM Configuration').' ';
+
+ $table_ncm_config = new stdClass();
+ $table_ncm_config->width = '100%';
+ $table_ncm_config->class = 'databox filter-table-adv';
+ $table_ncm_config->size = [];
+ $table_ncm_config->size[0] = '50%';
+ $table_ncm_config->data = [];
+
+ $table_ncm_config->data[0][] = html_print_label_input_block(
+ __('FTP server IP').ui_print_help_tip(__('This value will be used by TFTP_SERVER_IP macro in NCM scripts.'), true),
+ html_print_input_text(
+ 'tftp_server_ip',
+ $config['tftp_server_ip'],
+ '',
+ false,
+ 255,
+ true,
+ false,
+ false,
+ '',
+ 'w50p'
+ )
+ );
+
+ html_print_table($table_ncm_config);
+
+ echo ' ';
html_print_action_buttons(
html_print_submit_button(
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index e831022c23..d088e8c84f 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1422,6 +1422,14 @@ class DiscoveryTaskList extends HTML
$table->rowid = [];
$table->data = [];
+ $countErrors = 1;
+ $tableErrors = new StdClasS();
+ $tableErrors->class = 'databox data';
+ $tableErrors->width = '75%';
+ $tableErrors->styleTable = 'margin: 2em auto 0;border: 1px solid #ddd;background: white;';
+ $tableErrors->rowid = [];
+ $tableErrors->data = [];
+
if ($task['review_mode'] == DISCOVERY_RESULTS) {
$agents_review = db_get_all_rows_filter(
'tdiscovery_tmp_agents',
@@ -1476,11 +1484,11 @@ class DiscoveryTaskList extends HTML
$countSummary = 1;
if (is_array($task['stats']) === true && count(array_filter(array_keys($task['stats']), 'is_numeric')) === count($task['stats'])) {
foreach ($task['stats'] as $key => $summary) {
- $table->data[$i][0] = ''.__('Summary').' '.$countSummary.' ';
- $table->data[$i][1] = '';
- $countSummary++;
- $i++;
if (is_array($summary) === true) {
+ $table->data[$i][0] = ''.__('Summary').' '.$countSummary.' ';
+ $table->data[$i][1] = '';
+ $countSummary++;
+ $i++;
if (empty($summary['summary']) === true && empty($summary['info']) === true) {
$table->data[$i][0] = json_encode($summary, JSON_PRETTY_PRINT);
$table->data[$i][1] = '';
@@ -1517,8 +1525,12 @@ class DiscoveryTaskList extends HTML
$i++;
}
} else {
- $table->data[$i][0] = $summary;
- $table->data[$i][1] = '';
+ $tableErrors->data[$i][0] = ''.__('Error %s', $countErrors).' ';
+ $tableErrors->data[$i][1] = '';
+ $i++;
+ $tableErrors->data[$i][0] = $summary;
+ $tableErrors->data[$i][1] = '';
+ $countErrors++;
$i++;
}
}
@@ -1560,12 +1572,26 @@ class DiscoveryTaskList extends HTML
$table->data[$i++][1] .= '';
}
} else {
- $table->data[$i][0] = $task['stats']['summary'];
+ $tableErrors->data[$i][0] = ''.__('Error %s', $countErrors).' ';
+ $tableErrors->data[$i][1] = '';
+ $i++;
+ $tableErrors->data[$i][0] = $task['stats']['summary'];
+ $tableErrors->data[$i][1] = '';
+ $countErrors++;
+ $i++;
}
}
$output = ''.__('Summary').'
';
- $output .= html_print_table($table, true).'';
+ if (is_array($table->data) === true && count($table->data) > 0) {
+ $output .= html_print_table($table, true);
+ }
+
+ if (is_array($tableErrors->data) === true && count($tableErrors->data) > 0) {
+ $output .= html_print_table($tableErrors, true);
+ }
+
+ $output .= '';
}
return $output;
diff --git a/pandora_console/images/donut.svg b/pandora_console/images/donut.svg
new file mode 100644
index 0000000000..67c8733d33
--- /dev/null
+++ b/pandora_console/images/donut.svg
@@ -0,0 +1,7 @@
+
+
+ donut
+
+
+
\ No newline at end of file
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/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php
index 05d6152030..3ed4b3cc72 100644
--- a/pandora_console/include/class/Heatmap.class.php
+++ b/pandora_console/include/class/Heatmap.class.php
@@ -549,8 +549,12 @@ class Heatmap
global $config;
$filter_group = '';
- if (empty($this->filter) === false && current($this->filter) != -1) {
+ if (empty($this->filter) === false && current($this->filter) != -1
+ && implode(',', $this->filter) !== ''
+ ) {
$filter_group = 'AND am.id_module_group IN ('.implode(',', $this->filter).')';
+ } else {
+ return false;
}
$filter_name = '';
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a06a174ade..9ad1aa52da 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC231213';
+$build_version = 'PC231214';
$pandora_version = 'v7.0NG.774';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 2d6803ccd4..7dc206711d 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)) {
@@ -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);
@@ -4976,13 +4976,38 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
}
+/**
+ * agent belongs to the clusters.
+ *
+ * @param integer $idAgent
+ *
+ * @return array Names clusters.
+ */
+function agents_get_agent_belongs_cluster(int $idAgent): array
+{
+ $sql = sprintf(
+ 'SELECT tcluster.name
+ FROM tcluster
+ INNER JOIN tcluster_agent
+ ON tcluster.id = tcluster_agent.id_cluster
+ WHERE tcluster_agent.id_agent = %d',
+ $idAgent
+ );
+
+ $result = db_get_all_rows_sql($sql);
+ if ($result === false) {
+ $result = [];
+ }
+
+ return $result;
+}
+
+
/**
* Return an array with a list of status agents
*
* @return array.
*/
-
-
function agents_status_list()
{
$status_list = [];
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index e47e84adeb..0f55153922 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -431,6 +431,10 @@ function config_update_config()
if (config_update_value('inventory_changes_blacklist', implode(',', $inventory_changes_blacklist), true) === false) {
$error_update[] = __('Inventory changes blacklist');
}
+
+ if (config_update_value('tftp_server_ip', (string) get_parameter('tftp_server_ip'), true) === false) {
+ $error_update[] = __('Ftp server ip');
+ }
break;
case 'enterprise':
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 747e5154ce..f34a8f6239 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -5039,7 +5039,11 @@ function events_page_general($event)
$data[1] = $user_owner;
}
- $table_general->cellclass[3][1] = 'general_owner';
+ if (is_metaconsole() === true && $event['server_name'] !== '') {
+ $table_general->cellclass[4][1] = 'general_owner';
+ } else {
+ $table_general->cellclass[3][1] = 'general_owner';
+ }
$table_general->data[] = $data;
@@ -5099,38 +5103,21 @@ function events_page_general($event)
$table_general->cellclass[count($table_general->data)][1] = 'general_acknowleded';
$data = [];
+
+ if (empty($event['server_id']) === false && (int) $event['server_id'] > 0
+ && is_metaconsole() === true
+ ) {
+ $node_connect = new Node($event['server_id']);
+ $node_connect->connect();
+ }
+
$data[0] = __('Acknowledged by');
+ $data[1] = events_page_general_acknowledged($event['id_evento']);
- if ($event['estado'] == 1 || $event['estado'] == 2) {
- if (empty($event['id_usuario']) === true) {
- $user_ack = __('Autovalidated');
- } else {
- $user_ack = db_get_value(
- 'fullname',
- 'tusuario',
- 'id_user',
- $event['id_usuario']
- );
-
- if (empty($user_ack) === true) {
- $user_ack = $event['id_usuario'];
- }
- }
-
- $data[1] = $user_ack.' ( ';
- if ($event['ack_utimestamp_raw'] !== false
- && $event['ack_utimestamp_raw'] !== 'false'
- && empty($event['ack_utimestamp_raw']) === false
- ) {
- $data[1] .= date(
- $config['date_format'],
- $event['ack_utimestamp_raw']
- );
- }
-
- $data[1] .= ' ) ';
- } else {
- $data[1] = ''.__('N/A').' ';
+ if (empty($event['server_id']) === false && (int) $event['server_id'] > 0
+ && is_metaconsole() === true
+ ) {
+ $node_connect->disconnect();
}
$table_general->cellclass[7][1] = 'general_status';
@@ -5237,15 +5224,19 @@ function events_page_general_acknowledged($event_id)
$Acknowledged = '';
$event = db_get_row('tevento', 'id_evento', $event_id);
if ($event !== false && ($event['estado'] == 1 || $event['estado'] == 2)) {
- $user_ack = db_get_value(
- 'fullname',
- 'tusuario',
- 'id_user',
- $config['id_user']
- );
+ if (empty($event['id_usuario']) === true) {
+ $user_ack = __('Autovalidated');
+ } else {
+ $user_ack = db_get_value(
+ 'fullname',
+ 'tusuario',
+ 'id_user',
+ $config['id_user']
+ );
- if (empty($user_ack) === true) {
- $user_ack = $config['id_user'];
+ if (empty($user_ack) === true) {
+ $user_ack = $config['id_user'];
+ }
}
$Acknowledged = $user_ack.' ( ';
@@ -5260,7 +5251,7 @@ function events_page_general_acknowledged($event_id)
$Acknowledged .= ' ) ';
} else {
- $Acknowledged = 'N/A';
+ $Acknowledged = ''.__('N/A').' ';
}
return $Acknowledged;
@@ -5846,7 +5837,7 @@ function events_get_field_value_by_event_id(
}
-function events_get_instructions($event)
+function events_get_instructions($event, $max_text_length=300)
{
if (is_array($event) === false) {
return '';
@@ -5894,17 +5885,17 @@ function events_get_instructions($event)
return '';
}
- $max_text_length = 300;
$over_text = io_safe_output($value);
if (strlen($over_text) > ($max_text_length + 3)) {
$over_text = substr($over_text, 0, $max_text_length).'...';
+ } else {
+ return $value;
}
$output = '';
$output .= '
';
$output .= '
';
@@ -5913,7 +5904,6 @@ function events_get_instructions($event)
true,
['title' => $over_text]
).' ';
- $output .= '';
return $output;
}
@@ -6472,7 +6462,12 @@ function event_print_graph(
$color[] = '#82b92f';
}
} else {
- $interval_length = (int) ($period / $num_intervals);
+ if ($num_intervals > 0) {
+ $interval_length = (int) ($period / $num_intervals);
+ } else {
+ $interval_length = 0;
+ }
+
$intervals = [];
$intervals[0] = $start_utimestamp;
for ($i = 0; $i < $num_intervals; $i++) {
diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php
index 6283fdbaed..6264a75138 100755
--- a/pandora_console/include/functions_io.php
+++ b/pandora_console/include/functions_io.php
@@ -581,6 +581,9 @@ function io_output_password($password, $wrappedBy='')
$output = ($plaintext === ENTERPRISE_NOT_HOOK) ? $password : $plaintext;
+ // If password already decrypt return same password.
+ $output = (empty($plaintext) === true) ? $password : $plaintext;
+
return sprintf(
'%s%s%s',
$wrappedBy,
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 6ec74b33de..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,9 +3809,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 && (bool) $selection === 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;
@@ -3845,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;
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index f473961ab6..c8a794cc1d 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -804,6 +804,13 @@ function reporting_make_reporting_data(
);
break;
+ case 'service_level':
+ $report['contents'][] = reporting_service_level_detail(
+ $report,
+ $content
+ );
+ break;
+
case 'end_of_life':
$report['contents'][] = reporting_end_of_life(
$report,
@@ -966,7 +973,15 @@ function reporting_make_reporting_data(
break;
case 'ncm':
- $report['contents'][] = reporting_ncm_config(
+ $report['contents'][] = reporting_ncm_list(
+ $report,
+ $content,
+ $pdf
+ );
+ break;
+
+ case 'ncm_backups':
+ $report['contents'][] = reporting_ncm_backups(
$report,
$content,
$pdf
@@ -3707,6 +3722,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);
+}
+
+
/**
* OS Version End of Life
*
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 5dd77769ff..c52e920e92 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 'end_of_life':
reporting_html_end_of_life($table, $item);
break;
@@ -477,7 +480,11 @@ function reporting_html_print_report($report, $mini=false, $report_info=1, $cust
break;
case 'ncm':
- reporting_html_ncm_config($table, $item);
+ reporting_html_ncm_list($table, $item);
+ break;
+
+ case 'ncm_backups':
+ reporting_html_ncm_backups($table, $item);
break;
case 'top_n_agents_sh':
@@ -3080,6 +3087,85 @@ 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').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 = [];
+ $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'].'%';
+ $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;
+ }
+}
+
+
/**
* Html report end of life.
*
@@ -7665,40 +7751,146 @@ function reporting_html_permissions($table, $item, $pdf=0)
/**
- * HTML content for ncm configuration diff report.
+ * HTML content for ncm devices list.
*
- * @param array $item Content generated by reporting_ncm_config.
+ * @param array $item Content generated by reporting_ncm_list.
*
* @return string HTML code.
*/
-function reporting_html_ncm_config($table, $item, $pdf=0)
+function reporting_html_ncm_list($table, $item, $pdf=0)
{
- $key = uniqid();
+ // Create table diff.
+ $table_ncm = new stdClass();
+ $table_ncm->width = '100%';
+ $table_ncm->class = 'info_table';
+ $table_ncm->styleTable = 'table-layout: fixed;';
+ $table_ncm->titleclass = 'title_table_pdf';
+
+ $table_ncm->align = [];
+ $table_ncm->align['name'] = 'left';
+ $table_ncm->align['ip'] = 'left';
+ $table_ncm->align['vendor'] = 'left';
+ $table_ncm->align['model'] = 'left';
+ $table_ncm->align['firmware'] = 'left';
+ $table_ncm->align['last_backup_date'] = 'left';
+
+ $table_ncm->headstyle['name'] = 'text-align: left';
+ $table_ncm->headstyle['ip'] = 'text-align: left';
+ $table_ncm->headstyle['vendor'] = 'text-align: left';
+ $table_ncm->headstyle['model'] = 'text-align: left';
+ $table_ncm->headstyle['firmware'] = 'text-align: left';
+ $table_ncm->headstyle['last_backup_date'] = 'text-align: left';
+
+ $table_ncm->head = [];
+ $table_ncm->head['name'] = __('Name');
+ $table_ncm->head['ip'] = __('Ip');
+ $table_ncm->head['vendor'] = __('Vendor');
+ $table_ncm->head['model'] = __('Model');
+ $table_ncm->head['firmware'] = __('Firmware');
+ $table_ncm->head['last_backup_date'] = __('Last backup date');
+
+ $table_ncm->data = [];
+ foreach ($item['data'] as $key => $row) {
+ $title = $row['last_error'];
+ if (empty($title) === true) {
+ $title = null;
+ }
+
+ $table_ncm->data[] = [
+ $row['alias'],
+ $row['direccion'],
+ $row['vendor'],
+ $row['model'],
+ $row['firmware'],
+ $row['last_backup_date'],
+ ];
+ }
+
if ($pdf === 0) {
- ui_require_javascript_file('diff2html-ui.min');
- ui_require_css_file('diff2html.min');
- $script = "$(document).ready(function() {
- const configuration = {
- drawFileList: false,
- collapsed: true,
- matching: 'lines',
- outputFormat: 'side-by-side',
- };
- const diff2htmlUi = new Diff2HtmlUI(
- document.getElementById('".$key."'),
- atob('".base64_encode($item['data'])."'),
- configuration
- );
- diff2htmlUi.draw();
- });";
- $content = '
';
- $content .= '';
- $table->data[1] = $content;
- $table->colspan[1][0] = 2;
+ $table->colspan['data']['cell'] = 3;
+ $table->cellstyle['data']['cell'] = 'text-align: left;';
+ $table->data['data']['cell'] = html_print_table(
+ $table_ncm,
+ true
+ );
} else {
- $content = '
';
- $content .= str_replace("\n", '
';
- return $content;
+ $table_ncm->titleclass = 'title_table_pdf';
+ $table_ncm->titlestyle = 'text-align:left;';
+
+ return html_print_table(
+ $table_ncm,
+ true
+ );
}
}
+
+
+/**
+ * HTML content for ncm backup report.
+ *
+ * @param array $item Content generated by reporting_ncm_backups.
+ *
+ * @return string HTML code.
+ */
+function reporting_html_ncm_backups($table, $item, $pdf=0)
+{
+ ui_require_css_file('diff2html.min');
+ ui_require_css_file('highlight.min');
+ ui_require_css_file('highlight/vs.min');
+ ui_require_javascript_file('diff2html-ui.min');
+ ui_require_javascript_file('highlight.min');
+ ui_require_javascript_file('highlightjs-line-numbers.min');
+ ui_require_javascript_file('languages/plaintext.min');
+ ui_require_javascript_file('jquery', ENTERPRISE_DIR.'/include/javascript/');
+ ui_require_javascript_file('functions_ncm', ENTERPRISE_DIR.'/include/javascript/');
+
+ // Create table diff.
+ foreach ($item['data'] as $ncm_agent_key => $ncm_agent) {
+ $table_ncm = new stdClass();
+ if ($pdf === 1) {
+ $table_ncm->width = '100%';
+ }
+
+ $table_ncm->class = 'info_table';
+ $table_ncm->styleTable = 'table-layout: fixed;';
+ $table_ncm->headstyle[0] = 'width: 250px';
+ $table_ncm->head = [];
+ $table_ncm->head[0] = __('Date');
+ $table_ncm->head[1] = __('Diff');
+ $table_ncm->id = 'ncm_backups';
+ $table_ncm->name = 'ncm_backups';
+ $table_ncm->title = $ncm_agent['caption'];
+ $row = [];
+ foreach ($ncm_agent['data'] as $ncm_agent_data) {
+ if ($pdf === 1) {
+ $row[] = [
+ $ncm_agent_data['updated_at'],
+ ($ncm_agent_data['diffstr'] === '') ? $ncm_agent_data['diff'] : str_replace("\n", '
', $ncm_agent_data['diffstr']),
+ ];
+ } else {
+ $row[] = [
+ $ncm_agent_data['updated_at'],
+ $ncm_agent_data['diff'],
+ ];
+ }
+
+ $table_ncm->data = $row;
+ }
+
+ $table->colspan[$ncm_agent_key]['cell'] = 3;
+ $table->cellstyle[$ncm_agent_key]['cell'] = 'text-align: left;';
+ $table->data[$ncm_agent_key]['cell'] = html_print_table(
+ $table_ncm,
+ true
+ );
+ }
+
+ if ($pdf === 1) {
+ $table->width = '100%';
+ return html_print_table(
+ $table,
+ true
+ );
+ }
+
+}
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 9b77eed800..bb9f57f5c3 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'),
@@ -963,9 +967,14 @@ function reports_get_report_types($template=false, $not_editor=false)
];
}
+ $types['ncm_backups'] = [
+ 'optgroup' => __('NCM'),
+ 'name' => __('NCM configuration changes'),
+ ];
+
$types['ncm'] = [
'optgroup' => __('NCM'),
- 'name' => __('Network configuration changes'),
+ 'name' => __('NCM devices list'),
];
if (enterprise_installed() === true) {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 5c9a7e90fc..3ea3e8a740 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -7170,31 +7170,16 @@ function ui_print_comments($comment, $truncate_limit=255)
}
// Only show the last comment. If commment its too long,the comment will short with ...
- // If $config['prominent_time'] is timestamp the date show Month, day, hour and minutes.
+ // Forced time commentary to use copact date for optimize space in table.
// Else show comments hours ago
if ($comment['action'] != 'Added comment') {
$comment['comment'] = $comment['action'];
}
+ $comment['comment'] = io_safe_output($comment['comment']);
+
$short_comment = substr($comment['comment'], 0, 20);
- if ($config['prominent_time'] == 'timestamp') {
- $comentario = '
'.date($config['date_format'], $comment['utimestamp']).' ('.$comment['id_user'].'): '.$comment['comment'].'';
-
- if (strlen($comentario) > '200px' && $truncate_limit >= 255) {
- $comentario = ''.date($config['date_format'], $comment['utimestamp']).' ('.$comment['id_user'].'): '.$short_comment.'...';
- }
- } else {
- $rest_time = (time() - $comment['utimestamp']);
- $time_last = (($rest_time / 60) / 60);
-
- $comentario = ''.number_format($time_last, 0, $config['decimal_separator'], ($config['thousand_separator'] ?? ',')).' Hours ('.$comment['id_user'].'): '.$comment['comment'].'';
-
- if (strlen($comentario) > '200px' && $truncate_limit >= 255) {
- $comentario = ''.number_format($time_last, 0, $config['decimal_separator'], ($config['thousand_separator'] ?? ',')).' Hours ('.$comment['id_user'].'): '.$short_comment.'...';
- }
- }
-
- $comentario = io_safe_output($comentario);
+ $comentario = $comment['comment'];
if (strlen($comentario) >= $truncate_limit) {
$comentario = ui_print_truncate_text(
@@ -7209,6 +7194,12 @@ function ui_print_comments($comment, $truncate_limit=255)
);
}
+ $comentario = ''.ui_print_timestamp($comment['utimestamp'], true, ['style' => 'font-size: 10px; display: contents;', 'prominent' => 'compact']).' ('.$comment['id_user'].'): '.$comment['comment'].'';
+
+ if (strlen($comentario) > '200px' && $truncate_limit >= 255) {
+ $comentario = ''.ui_print_timestamp($comment['utimestamp'], true, ['style' => 'font-size: 10px; display: contents;', 'prominent' => 'compact']).' ('.$comment['id_user'].'): '.$short_comment.'...';
+ }
+
return $comentario;
}
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 65ea9f2a75..c7b296ebaa 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -1549,14 +1549,41 @@ $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
title: "Minimize"
}).insertBefore(closeButton);
+ // Add the minimize icon to the minimize button
+ $("", {
+ class: "ui-button-icon ui-icon",
+ style:
+ "background-color: rgb(51, 51, 51); -webkit-mask: url('images/arrow-down-white.png') no-repeat / contain !important;"
+ }).appendTo(minimizeButton);
+
+ $("", {
+ class: "ui-button-icon-space"
+ })
+ .html(" ")
+ .appendTo(minimizeButton);
+
// Add the disengage button before the minimize button
var disengageButton = $("", {
class:
"ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-disengage disengage-buttom-image",
type: "button",
- title: "Disengage"
+ title: "Disengage",
+ style: "float: right; position:relative;"
}).insertBefore(minimizeButton);
+ // Add the disengage icon to the disengage button
+ $("", {
+ class: "ui-button-icon ui-icon",
+ style:
+ "background-color: rgb(51, 51, 51); -webkit-mask: url('images/dashboard.menu.png') no-repeat center / contain !important;"
+ }).appendTo(disengageButton);
+
+ $("", {
+ class: "ui-button-icon-space"
+ })
+ .html(" ")
+ .appendTo(disengageButton);
+
minimizeButton.click(function(e) {
if ($("#minimize_arrow_event_sound").hasClass("arrow_menu_up")) {
$("#minimize_arrow_event_sound").removeClass("arrow_menu_up");
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index 45ca47e92b..00ece1a178 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -104,11 +104,8 @@ function load_modal(settings) {
width = settings.onshow.width;
}
- if (settings.modal.overlay == undefined) {
- settings.modal.overlay = {
- opacity: 0.5,
- background: "black"
- };
+ if (settings.modal.overlay === true) {
+ $("body").append("
");
}
if (settings.beforeClose == undefined) {
@@ -496,7 +493,6 @@ function load_modal(settings) {
settings.onshow.maxHeight != undefined
? settings.onshow.maxHeight
: "auto",
- overlay: settings.modal.overlay,
position: {
my: "top+20%",
at: "top",
@@ -518,6 +514,7 @@ function load_modal(settings) {
if (settings.cleanup != undefined) {
settings.cleanup();
}
+ $("#modal_overlay").remove();
},
beforeClose: settings.beforeClose()
});
diff --git a/pandora_console/include/lib/Cluster.php b/pandora_console/include/lib/Cluster.php
index b7bd21d929..46e7ba4324 100644
--- a/pandora_console/include/lib/Cluster.php
+++ b/pandora_console/include/lib/Cluster.php
@@ -213,6 +213,10 @@ class Cluster extends Entity
public function getCounters() :array
{
$id_agent_modules = $this->getIdsModulesInvolved();
+ if (empty($id_agent_modules) === true) {
+ return [];
+ }
+
$sql = sprintf(
'SELECT SUM( IF(estado = 1, 1, 0) ) AS critical,
SUM( IF(estado = 2, 1, 0) ) AS warning,
diff --git a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
index 363ea1489e..e199a80ad8 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
@@ -320,6 +320,10 @@ class HeatmapWidget extends Widget
$module_groups[$module_group['id_mg']] = $module_group['name'];
}
+ if (empty($values['module_groups'][0]) === true) {
+ $values['module_groups'][0] = 0;
+ }
+
$inputs[] = [
'label' => __('Module group'),
'style' => ($values['type'] === '2') ? '' : 'display:none',
@@ -332,7 +336,7 @@ class HeatmapWidget extends Widget
'return' => true,
'multiple' => true,
'nothing' => __('Not assigned'),
- 'nothing_value' => 0,
+ 'nothing_value' => '0',
],
];
diff --git a/pandora_console/include/lib/TacticalView/elements/NewsBoard.php b/pandora_console/include/lib/TacticalView/elements/NewsBoard.php
index 3be2dd685f..a2a2b7faba 100644
--- a/pandora_console/include/lib/TacticalView/elements/NewsBoard.php
+++ b/pandora_console/include/lib/TacticalView/elements/NewsBoard.php
@@ -117,6 +117,8 @@ class NewsBoard extends Element
$output .= ' ";
- echo "
";
+ echo "";
echo '';
echo '';
echo '
';
ui_require_css_file('datatables.min', 'include/styles/js/');
+ui_require_css_file('custom_field', 'include/styles/');
ui_require_javascript_file_enterprise('functions_csv');
ui_require_javascript_file('datatables.min');
ui_require_javascript_file('buttons.dataTables.min');
@@ -904,7 +891,6 @@ function dialog_filter_cf(title, type_form){
}
function table_datatables(filters, indexed_descriptions, processing){
- console.log(indexed_descriptions);
array_data = JSON.parse(filters);
table = $('#datatables').DataTable({
processing: true,
@@ -913,7 +899,6 @@ function table_datatables(filters, indexed_descriptions, processing){
searching: true,
pageLength: Number(array_data.block_size),
lengthMenu: [ 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 75, 100],
- //buttons: [{ extend: 'csvHtml5', text: 'Save as csvHtml5' }],
responsive: false,
ajax: {
type: "POST",
@@ -933,21 +918,16 @@ function table_datatables(filters, indexed_descriptions, processing){
'paging': true,
'ordering': true,
'scrollX': true,
- 'scroller': true
+ 'scroller': true,
},
},
language: {
processing: processing,
lengthMenu: "Show _MENU_ items per page",
zeroRecords: "Nothing found. Please change your search term",
- //info: "Page _PAGE_ of _PAGES_",
infoEmpty: "No results",
infoFiltered: "",
search: "Search:",
- /*paginate:{
- next: "Next",
- previous: "Next"
- }*/
},
sDom: '<"top"lfp>rt<"bottom"ip><"clear">',
columns: [
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index be5f6047e3..6d969481a3 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -547,6 +547,45 @@ if (is_ajax() === true) {
);
}
+ if (empty($tmp->tags) === false) {
+ $tmp->tags = ui_print_truncate_text(
+ $tmp->tags,
+ 30,
+ false,
+ true,
+ false,
+ '…',
+ true,
+ true,
+ );
+ }
+
+ if (empty($tmp->event_custom_id) === false) {
+ $tmp->event_custom_id = ui_print_truncate_text(
+ $tmp->event_custom_id,
+ 30,
+ false,
+ true,
+ false,
+ '…',
+ true,
+ true,
+ );
+ }
+
+ if (empty($tmp->module_custom_id) === false) {
+ $tmp->module_custom_id = ui_print_truncate_text(
+ $tmp->module_custom_id,
+ 30,
+ false,
+ true,
+ false,
+ '…',
+ true,
+ true,
+ );
+ }
+
if (empty($tmp->comments) === false) {
$tmp->comments = ui_print_comments($tmp->comments, 20);
}
@@ -650,19 +689,7 @@ if (is_ajax() === true) {
$tmp->data = ui_print_truncate_text($tmp->data, 10);
}
- $tmp->instructions = events_get_instructions($item);
- if (strlen($tmp->instructions) >= 20) {
- $tmp->instructions = ui_print_truncate_text(
- $tmp->instructions,
- 20,
- false,
- true,
- false,
- '…',
- true,
- true,
- );
- }
+ $tmp->instructions = events_get_instructions($item, 15);
$tmp->user_comment = ui_print_comments(
event_get_last_comment(
@@ -899,14 +926,14 @@ if (is_ajax() === true) {
true,
[
'title' => __('Unknown'),
- 'class' => 'forced-title',
+ 'class' => 'forced-title main_menu_icon',
]
);
$state = 0;
break;
}
- $draw_state = '';
+ $draw_state = '
';
$draw_state .= '
';
$draw_state .= $state;
$draw_state .= ' ';
@@ -1199,10 +1226,10 @@ if (is_ajax() === true) {
}
$tmp->custom_data = $custom_data_str;
- if (strlen($tmp->custom_data) >= 20) {
+ if (strlen($tmp->custom_data) >= 50) {
$tmp->custom_data = ui_print_truncate_text(
$tmp->custom_data,
- 20,
+ 50,
false,
true,
false,
@@ -1232,15 +1259,18 @@ if (is_ajax() === true) {
);
}
- $data = array_values(
- array_filter(
- $data,
- function ($item) {
- return (bool) (array) $item;
- }
- )
- );
- $count = count($data);
+ if (isset($data) === true) {
+ $data = array_values(
+ array_filter(
+ $data,
+ function ($item) {
+ return (bool) (array) $item;
+ }
+ )
+ );
+ $count = count($data);
+ }
+
// RecordsTotal && recordsfiltered resultados totales.
echo json_encode(
[
@@ -2585,7 +2615,7 @@ try {
if ($evento_id !== false) {
$fields[$evento_id] = [
'text' => 'evento',
- 'class' => 'mw250px',
+ 'class' => 'mw180px',
];
}
@@ -2594,23 +2624,24 @@ try {
$fields[$comment_id] = ['text' => 'user_comment'];
}
-
- foreach ($fields as $key => $field) {
- if (is_array($field) === false) {
- $fields[$key] = [
- 'text' => $field,
- 'class' => 'mw100px',
- ];
- }
+ $estado = array_search('estado', $fields);
+ if ($estado !== false) {
+ $fields[$estado] = [
+ 'text' => $fields[$estado],
+ 'class' => 'column-estado',
+ ];
}
+
+
+
// Always add options column.
$fields = array_merge(
$fields,
[
[
'text' => 'options',
- 'class' => 'table_action_buttons mw120px',
+ 'class' => 'table_action_buttons mw100px',
],
[
'text' => 'm',
diff --git a/pandora_console/operation/inventory/inventory.php b/pandora_console/operation/inventory/inventory.php
index 0a7754e46d..43296a1b26 100755
--- a/pandora_console/operation/inventory/inventory.php
+++ b/pandora_console/operation/inventory/inventory.php
@@ -675,7 +675,9 @@ $params['return'] = true;
$params['show_helptip'] = true;
$params['input_name'] = 'agent';
$params['value'] = $inventory_agent;
-$params['javascript_is_function_select'] = true;
+$params['selectbox_id'] = 'module_inventory_general_view';
+// $params['javascript_is_function_select'] = true;
+// $params['javascript_function_action_after_select'] = 'this.form.submit';
$params['use_hidden_input_idagent'] = true;
$params['print_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent';
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index cc42d7e6ac..4bc5a05b61 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -335,6 +335,7 @@ $table2->data[0][3] = $html_menu_export;
$searchForm = '