diff --git a/pandora_console/extras/mr/25.sql b/pandora_console/extras/mr/25.sql
new file mode 100644
index 0000000000..b8a1eca9ae
--- /dev/null
+++ b/pandora_console/extras/mr/25.sql
@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index bedb9927cd..99a5dae2be 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1206,6 +1206,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview',
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '731');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
-- ---------------------------------------------------------------------
-- Table `tconfig_os`
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 0d34b416a4..fd4d9d050f 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1068,7 +1068,7 @@ if (!empty($result)) {
$table->size = array ();
$table->align = array ();
-$show_fields = explode (',', $config['status_monitor_fields']);
+ $show_fields = explode (',', $config['status_monitor_fields']);
if (in_array('policy', $show_fields)) {
@@ -1131,7 +1131,7 @@ $show_fields = explode (',', $config['status_monitor_fields']);
$table->head[9] = __('Data');
$table->align[9] = 'left';
if ( is_metaconsole() ) {
- $table->head[9] .= ' ' . html_print_image('images/sort_up.png', true, array('style' => $selectStatusUp, 'alt' => 'up')) . '' .
+ $table->head[9] .= ' ' . html_print_image('images/sort_up.png', true, array('style' => $selectStatusUp, 'alt' => 'up')) . '' .
'' . html_print_image('images/sort_down.png', true, array('style' => $selectStatusDown, 'alt' => 'down')) . '';
}
}
@@ -1644,523 +1644,6 @@ $show_fields = explode (',', $config['status_monitor_fields']);
array_push ($table->data, $data);
}
-
- html_print_table ($table);
-
- $table->head[2] = __('Data Type');
- $table->head[2] .= ' '.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown, 'alt' => 'down']).'';
-
- $table->align[2] = 'left';
-
- $table->head[3] = __('Module name');
- $table->head[3] .= ' '.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).'';
-
- $table->head[4] = __('Server type');
- $table->head[4] .= ' '.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).'';
-
- $table->head[5] = __('Interval');
- $table->head[5] .= ' '.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown, 'alt' => 'down']).'';
- $table->align[5] = 'left';
-
- $table->head[6] = __('Status');
- $table->head[6] .= ' '.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).'';
-
- $table->align[6] = 'left';
-
- $table->head[7] = __('Graph');
- $table->align[7] = 'left';
-
- $table->head[8] = __('Warn');
- $table->align[8] = 'left';
-
- $table->head[9] = __('Data');
- $table->align[9] = 'left';
- if (is_metaconsole()) {
- $table->head[9] .= ' '.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).'';
- }
-
- $table->head[10] = __('Timestamp');
- $table->head[10] .= ' '.html_print_image('images/sort_up.png', true, ['style' => $selectTimestampUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTimestampDown, 'alt' => 'down']).'';
- $table->align[10] = 'left';
-
- $id_type_web_content_string = db_get_value(
- 'id_tipo',
- 'ttipo_modulo',
- 'nombre',
- 'web_content_string'
- );
-
- foreach ($result as $row) {
- // Avoid unset, null and false value
- if (empty($row['server_name'])) {
- $row['server_name'] = '';
- }
-
- $is_web_content_string = (bool) db_get_value_filter(
- 'id_agente_modulo',
- 'tagente_modulo',
- [
- 'id_agente_modulo' => $row['id_agente_modulo'],
- 'id_tipo_modulo' => $id_type_web_content_string,
- ]
- );
-
- // Fixed the goliat sends the strings from web
- // without HTML entities
- if ($is_web_content_string) {
- $row['datos'] = io_safe_input($row['datos']);
- }
-
- // Fixed the data from Selenium Plugin
- if ($row['datos'] != strip_tags($row['datos'])) {
- $row['datos'] = io_safe_input($row['datos']);
- }
-
- $data = [];
- if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
- if (is_metaconsole()) {
- $node = metaconsole_get_connection_by_id($row['server_id']);
- if (metaconsole_load_external_db($node) !== NOERR) {
- // Restore the default connection.
- metaconsole_restore_db();
- $errors++;
- break;
- }
- }
-
- $policyInfo = policies_info_module_policy($row['id_agente_modulo']);
-
- if ($policyInfo === false) {
- $data[0] = '';
- } else {
- $linked = policies_is_module_linked($row['id_agente_modulo']);
-
- $adopt = false;
- if (policies_is_module_adopt($row['id_agente_modulo'])) {
- $adopt = true;
- }
-
- if ($linked) {
- if ($adopt) {
- $img = 'images/policies_brick.png';
- $title = __('(Adopt) ').$policyInfo['name_policy'];
- } else {
- $img = 'images/policies.png';
- $title = $policyInfo['name_policy'];
- }
- } else {
- if ($adopt) {
- $img = 'images/policies_not_brick.png';
- $title = __('(Unlinked) (Adopt) ').$policyInfo['name_policy'];
- } else {
- $img = 'images/unlinkpolicy.png';
- $title = __('(Unlinked) ').$policyInfo['name_policy'];
- }
- }
-
- if (is_metaconsole()) {
- $data[0] = ''.html_print_image($img, true, ['title' => $title]).'';
- } else {
- $data[0] = ''.html_print_image($img, true, ['title' => $title]).'';
- }
- }
-
- if (is_metaconsole()) {
- metaconsole_restore_db();
- }
- }
-
- $agent_alias = !empty($row['agent_alias']) ? $row['agent_alias'] : $row['agent_name'];
-
- // TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
- if (defined('METACONSOLE')) {
- $agent_link = '';
- $agent_alias = ui_print_truncate_text(
- $agent_alias,
- 'agent_small',
- false,
- true,
- false,
- '[…]',
- 'font-size:7.5pt;'
- );
- if (can_user_access_node()) {
- $data[1] = $agent_link.''.$agent_alias.'';
- } else {
- $data[1] = $agent_alias;
- }
- } else {
- $data[1] = '';
- $data[1] .= ui_print_truncate_text($agent_alias, 'agent_medium', false, true, false, '[…]', 'font-size:7.5pt;');
- $data[1] .= '';
- }
-
-
- $data[2] = html_print_image('images/'.modules_show_icon_type($row['module_type']), true);
- $agent_groups = is_metaconsole() ? $row['groups_in_server'] : agents_get_all_groups_agent($row['id_agent'], $row['id_group']);
- if (check_acl_one_of_groups($config['id_user'], $agent_groups, 'AW')) {
- $show_edit_icon = true;
- if (defined('METACONSOLE')) {
- if (!can_user_access_node()) {
- $show_edit_icon = false;
- }
-
- $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1'.'&loginhash=auto&loginhash_data='.$row['hashdata'].'&loginhash_user='.str_rot13($row['user']);
- } else {
- $url_edit_module = 'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1';
- }
-
- if ($show_edit_icon) {
- $data[2] .= ''.html_print_image(
- 'images/config.png',
- true,
- [
- 'alt' => '0',
- 'border' => '',
- 'title' => __('Edit'),
- ]
- ).'';
- }
- }
-
- $data[3] = ui_print_truncate_text($row['module_name'], 'agent_small', false, true, true);
- if ($row['extended_info'] != '') {
- $data[3] .= ui_print_help_tip($row['extended_info'], true, '/images/default_list.png');
- }
-
- if ($row['tags'] != '') {
- $data[3] .= html_print_image(
- '/images/tag_red.png',
- true,
- [
- 'title' => $row['tags'],
- 'style' => 'width: 20px; margin-left: 3px;',
- ]
- );
- }
-
- $data[4] = servers_show_type($row['id_modulo']);
-
- $data[5] = ($row['module_interval'] == 0) ? human_time_description_raw($row['agent_interval']) : human_time_description_raw($row['module_interval']);
-
- if ($row['utimestamp'] == 0 && (($row['module_type'] < 21
- || $row['module_type'] > 23) && $row['module_type'] != 100)
- ) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_NO_DATA,
- __('NOT INIT'),
- true
- );
- } else if ($row['estado'] == 0) {
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_OK,
- __('NORMAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_OK,
- __('NORMAL').': '.$row['datos'],
- true
- );
- }
- } else if ($row['estado'] == 1) {
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_CRITICAL,
- __('CRITICAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_CRITICAL,
- __('CRITICAL').': '.$row['datos'],
- true
- );
- }
- } else if ($row['estado'] == 2) {
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_WARNING,
- __('WARNING').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_WARNING,
- __('WARNING').': '.$row['datos'],
- true
- );
- }
- } else {
- $last_status = modules_get_agentmodule_last_status(
- $row['id_agente_modulo']
- );
- switch ($last_status) {
- case 0:
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('NORMAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('NORMAL').': '.$row['datos'],
- true
- );
- }
- break;
-
- case 1:
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.$row['datos'],
- true
- );
- }
- break;
-
- case 2:
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.$row['datos'],
- true
- );
- }
- break;
- }
- }
-
- $data[7] = '';
-
- $acl_graphs = false;
-
- // Avoid the check on the metaconsole. Too slow to show/hide an icon depending on the permissions
- if (!is_metaconsole()) {
- $acl_graphs = check_acl($config['id_user'], $row['id_group'], 'RR');
- } else {
- $acl_graphs = true;
- }
-
- if ($row['history_data'] == 1 && $acl_graphs) {
- $graph_type = return_graphtype($row['module_type']);
-
- $url = ui_get_full_url('operation/agentes/stat_win.php', false, false, false);
- $handle = dechex(crc32($row['id_agente_modulo'].$row['module_name']));
- $win_handle = 'day_'.$handle;
-
- $graph_params = [
- 'type' => $graph_type,
- 'period' => SECONDS_1DAY,
- 'id' => $row['id_agente_modulo'],
- 'label' => base64_encode($row['module_name']),
- 'refresh' => SECONDS_10MINUTES,
- ];
-
- if (is_metaconsole() && isset($row['server_id'])) {
- // Set the server id
- $graph_params['server'] = $row['server_id'];
- }
-
- $graph_params_str = http_build_query($graph_params);
-
- $link = 'winopeng(\''.$url.'?'.$graph_params_str.'\',\''.$win_handle.'\')';
-
- $data[7] = get_module_realtime_link_graph($row);
-
- if (!is_snapshot_data($row['datos'])) {
- $data[7] .= ''.html_print_image('images/chart_curve.png', true, ['border' => '0', 'alt' => '']).'';
- }
-
- $data[7] .= ''.html_print_image(
- 'images/binary.png',
- true,
- [
- 'border' => '0',
- 'alt' => '',
- ]
- ).'';
-
- $data[7] .= ''.$row['module_name'].'';
- }
-
- $data[8] = ui_print_module_warn_value(
- $row['max_warning'],
- $row['min_warning'],
- $row['str_warning'],
- $row['max_critical'],
- $row['min_critical'],
- $row['str_critical']
- );
-
- if (is_numeric($row['datos']) && !modules_is_string_type($row['module_type'])) {
- if ($config['render_proc']) {
- switch ($row['module_type']) {
- case 2:
- case 6:
- case 9:
- case 18:
- case 21:
- case 31:
- if ($row['datos'] >= 1) {
- $salida = $config['render_proc_ok'];
- } else {
- $salida = $config['render_proc_fail'];
- }
- break;
-
- default:
- switch ($row['module_type']) {
- case 15:
- $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $row['id_agente_modulo']);
- if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
- $salida = human_milliseconds_to_string($row['datos']);
- } else {
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- }
- break;
-
- default:
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- break;
- }
- break;
- }
- } else {
- switch ($row['module_type']) {
- case 15:
- $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $row['id_agente_modulo']);
- if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
- $salida = human_milliseconds_to_string($row['datos']);
- } else {
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- }
- break;
-
- default:
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- break;
- }
- }
-
- // Show units ONLY in numeric data types
- if (isset($row['unit'])) {
- $data_macro = modules_get_unit_macro($row['datos'], $row['unit']);
- if ($data_macro) {
- $salida = $data_macro;
- } else {
- $salida .= ' '.''.io_safe_output($row['unit']).'';
- if (strlen($salida) > $config['agent_size_text_small']) {
- $salida = ui_print_truncate_text($salida, 'agent_small', true, true, false, '[…]', 'font-size:7.5pt;');
- // clean tag
- $text_aux = explode(' $row['id_agente_modulo'],
- 'interval' => $row['current_interval'],
- 'module_name' => $row['module_name'],
- 'id_node' => $row['server_id'],
- ]
- );
- $salida = ui_get_snapshot_image($link, $is_snapshot).' ';
- } else {
- $sub_string = substr(io_safe_output($row['datos']), 0, 12);
- if ($module_value == $sub_string) {
- if ($module_value == 0 && !$sub_string) {
- $salida = 0;
- } else {
- $data_macro = modules_get_unit_macro($row['datos'], $row['unit']);
- if ($data_macro) {
- $salida = $data_macro;
- } else {
- $salida = $row['datos'];
- }
- }
- } else {
- // Fixed the goliat sends the strings from web
- // without HTML entities
- if ($is_web_content_string) {
- $sub_string = substr($row['datos'], 0, 12);
- } else {
- // Fixed the data from Selenium Plugin
- if ($module_value != strip_tags($module_value)) {
- $module_value = io_safe_input($module_value);
- $sub_string = substr($row['datos'], 0, 12);
- } else {
- $sub_string = substr(io_safe_output($row['datos']), 0, 12);
- }
- }
-
- if ($module_value == $sub_string) {
- $salida = $module_value;
- } else {
- $salida = '".$module_value.''.'".''.$sub_string.' '."".html_print_image('images/rosette.png', true).'';
- }
- }
- }
- }
-
- $data[9] = $salida;
-
- if ($row['module_interval'] > 0) {
- $interval = $row['module_interval'];
- } else {
- $interval = $row['agent_interval'];
- }
-
- if ($row['estado'] == 3) {
- $option = [
- 'html_attr' => 'class="redb"',
- 'style' => 'font-size:7pt;',
- ];
- } else {
- $option = ['style' => 'font-size:7pt;'];
- }
-
- $data[10] = ui_print_timestamp($row['utimestamp'], true, $option);
-
- array_push($table->data, $data);
- }
html_print_table($table);
} else {