Merge remote-tracking branch 'origin/develop' into ent-3287-Sincronización-plugin-de-servidor

Former-commit-id: 93fd236f1876132a18aae31f8ccbcd888a1613f0

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.731-190222
+Version: 7.0NG.731-190225
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190222"
+pandora_version="7.0NG.731-190225"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.731';
-use constant AGENT_BUILD => '190222';
+use constant AGENT_BUILD => '190225';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.731
-%define release     190222
+%define release     190225
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.731
-%define release     190222
+%define release     190225
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190222"
+PI_BUILD="190225"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190222}
+{190225}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.731(Build 190222)")
+#define PANDORA_VERSION ("7.0NG.731(Build 190225)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.731(Build 190222))"
+      VALUE "ProductVersion", "(7.0NG.731(Build 190225))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.731-190222
+Version: 7.0NG.731-190225
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190222"
+pandora_version="7.0NG.731-190225"
 
 package_pear=0
 package_pandora=1

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;

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`

pandora_console/godmode/agentes/status_monitor_custom_fields.php

@@ -0,0 +1,240 @@
+<?php
+
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+global $config;
+
+check_login ();
+
+if (! check_acl ($config['id_user'], 0, 'AR')
+	&& ! check_acl ($config['id_user'], 0, 'AW') && 
+		! check_acl ($config['id_user'], 0, 'AM')) {
+	db_pandora_audit('ACL Violation',
+		'Trying to access Agent Management');
+	require ('general/noaccess.php');
+	return;
+}
+
+$update = get_parameter('upd_button', '');
+$default = (int) get_parameter('default', 0);
+
+
+if ($default != 0) {
+	$fields_selected = explode (',', $config['status_monitor_fields']);
+}
+else if ($update != '') {
+	$fields_selected = (array)get_parameter('fields_selected');
+	
+	if ($fields_selected[0] == '') {
+		$fields_selected = explode (',', $config['status_monitor_fields']);
+	}
+	else {
+		$status_monitor_fields = implode (',', $fields_selected);
+	}
+	
+	$values = array(
+		'token' => 'status_monitor_fields',
+		'value' => $status_monitor_fields
+	);
+
+	//update 'status_monitor_fields' in tconfig table to keep the value at update.
+	$result = db_process_sql_update('tconfig', $values,
+		array ('token' => 'status_monitor_fields'));
+
+	ui_print_result_message ($result, __('Successfully updated'), __('Could not be updated'));
+
+	$config['status_monitor_fields'] = $status_monitor_fields;
+}
+
+$fields_selected = array();
+$status_monitor_fields = '';
+$fields_selected = explode (',', $config['status_monitor_fields']);
+
+$result_selected = array();
+
+//show list of fields selected.
+if ($fields_selected[0]!='') {
+	foreach ($fields_selected as $field_selected) {
+		switch ($field_selected) {
+			case 'policy':
+				$result = __('Policy');
+				break;
+			case 'agent':
+				$result = __('Agent');
+				break;
+			case 'data_type':
+				$result = __('Data type');
+				break;
+			case 'module_name':
+				$result = __('Module name');
+				break;
+			case 'server_type':
+				$result = __('Server type');
+				break;
+			case 'interval':
+				$result = __('Interval');
+				break;
+			case 'status':
+				$result = __('Status');
+				break;
+			case 'graph':
+				$result = __('Graph');
+				break;
+			case 'warn':
+				$result = __('Warn');
+				break;
+			case 'data':
+				$result = __('Data');
+				break;
+			case 'timestamp':
+				$result = __('Timestamp');
+				break;
+			case 'to_critical':
+				$result = __('Last status change');
+				break;
+		}
+		$result_selected[$field_selected] = $result;
+	}
+}
+
+echo '<h3>'.__('Show monitor detail fields').'</h3>';
+
+$table = new stdClass();
+$table->width = '100%';
+$table->class = 'databox filters';
+
+$table->size = array();
+//~ $table->size[0] = '20%';
+$table->size[1] = '10px';
+//~ $table->size[2] = '20%';
+
+$table->style[0] = 'text-align:center;';
+$table->style[2] = 'text-align:center;';
+
+$table->data = array();
+
+$fields_available = array();
+
+$fields_available['policy'] = __('Policy');
+$fields_available['agent'] = __('Agent');
+$fields_available['data_type'] = __('Data type');
+$fields_available['module_name'] = __('Module name');
+$fields_available['server_type'] = __('Server type');
+$fields_available['interval'] = __('Interval');
+$fields_available['status'] = __('Status');
+$fields_available['graph'] = __('Graph');
+$fields_available['warn'] = __('Warn');
+$fields_available['data'] = __('Data');
+$fields_available['timestamp'] = __('Timestamp');
+$fields_available['to_critical'] = __('Last status change');
+
+//remove fields already selected
+foreach ($fields_available as $key=>$available) {
+	foreach ($result_selected as $selected) {
+		if ($selected == $available) {
+			unset($fields_available[$key]);
+		}
+	}
+}
+
+$table->data[0][0] =  '<b>' . __('Fields available').'</b>';
+$table->data[1][0] = html_print_select ($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
+$table->data[1][1] =  '<a href="javascript:">' .
+	html_print_image('images/darrowright.png', true,
+	array('id' => 'right', 'title' => __('Add fields to select'))) .
+	'</a>';
+$table->data[1][1] .= '<br><br><br><br><a href="javascript:">' .
+	html_print_image('images/darrowleft.png', true,
+	array('id' => 'left', 'title' => __('Delete fields to select'))) .
+	'</a>';
+
+$table->data[0][1] = '';
+$table->data[0][2] = '<b>' . __('Fields selected') . '</b>';
+$table->data[1][2] =  html_print_select($result_selected,
+	'fields_selected[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
+
+echo '<form id="custom_status_monitor" method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields&amp;pure='.$config['pure'].'">';
+html_print_table($table);
+
+echo '<div class="action-buttons" style="width: '.$table->width.'">';
+	html_print_submit_button (__('Update'), 'upd_button', false, 'class="sub upd"');
+echo '</form>';
+echo '</div>';
+?>
+
+<script type="text/javascript">
+/* <![CDATA[ */
+$(document).ready (function () {
+	
+	$("#right").click (function () {
+		jQuery.each($("select[name='fields_available[]'] option:selected"), function (key, value) {
+			field_name = $(value).html();
+			if (field_name != <?php echo "'".__('None')."'"; ?>) {
+				id_field = $(value).attr('value');
+				$("select[name='fields_selected[]']").append($("<option></option>").html(field_name).attr("value", id_field));
+				$("#fields_available").find("option[value='" + id_field + "']").remove();
+				$("#fields_selected").find("option[value='0']").remove();
+			}
+		});
+	});
+	
+	$("#left").click (function () {
+		var current_fields_size = ($('#fields_selected option').length);	
+		var selected_fields = [];
+		var selected_fields_total = '';
+
+		jQuery.each($("select[name='fields_selected[]'] option:selected"), function (key, value) {
+			field_name = $(value).html();
+ 			selected_fields.push(field_name);
+		 	selected_fields_total = selected_fields.length;
+		});
+
+		if(selected_fields_total === current_fields_size){
+			display_confirm_dialog(
+				"<?php echo '<span style=text-transform:none;font-size:9.5pt;>'.__('There must be at least one custom field. Timestamp will be set by default').'</span>'; ?>",
+				"<?php echo __('Confirm'); ?>",
+				"<?php echo __('Cancel'); ?>",
+				function () {
+					move_left();
+					$("#fields_available").find("option[value='timestamp']").remove();
+					$("select[name='fields_selected[]']").append($("<option></option>").val('timestamp').html('<i>' + 'Timestamp' + '</i>'));
+				}
+			);
+		}
+		else{
+			move_left();
+		}
+	});
+	
+	$("#submit-upd_button").click(function () {
+		$("#fields_selected").find("option[value='0']").remove();
+		$('#fields_selected option').map(function() {
+			$(this).prop('selected', true);
+		});
+	});
+});
+
+function move_left(){
+	jQuery.each($("select[name='fields_selected[]'] option:selected"), function (key, value) {
+		field_name = $(value).html();
+		if (field_name != <?php echo "'".__('None')."'"; ?>) {
+			id_field = $(value).attr('value');
+			$("select[name='fields_available[]']").append($("<option></option>").val(id_field).html('<i>' + field_name + '</i>'));
+			$("#fields_selected").find("option[value='" + id_field + "']").remove();
+			$("#fields_available").find("option[value='0']").remove();
+		}
+	});
+}
+</script>

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190222';
+$build_version = 'PC190225';
 $pandora_version = 'v7.0NG.731';
 
 // Do not overwrite default timezone set if defined.

pandora_console/install.php

@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
 $version = '7.0NG.731';
-$build = '190222';
+$build = '190225';
             $banner = "v$version Build $build";
 
             error_reporting(0);

pandora_console/operation/agentes/status_monitor.php

@@ -37,12 +37,35 @@ enterprise_include_once('include/functions_metaconsole.php');
 $isFunctionPolicies = enterprise_include_once('include/functions_policies.php');
 
 if (! defined('METACONSOLE')) {
-    // Header
-    ui_print_page_header(
-        __('Monitor detail'),
-        'images/brick.png',
-        false
-    );
+    $section = (string) get_parameter ("section", "view");
+
+    $buttons['fields'] = array('active' => false, 
+        'text' => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&amp;section=fields">' . 
+        html_print_image("images/custom_columns.png", true, array("title" => __('Custom fields'))) . '</a>',
+        'operation' => true);
+
+    $buttons['view'] = array('active' => false, 
+        'text' => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor">' . 
+        html_print_image("images/list.png", true, array("title" => __('View'))) . '</a>',
+        'operation' => true);
+
+    switch ($section) {
+        case 'fields':
+            $buttons['fields']['active'] = true;
+            $subpage = ' - ' . __('Custom fields');
+            break;
+        default:
+            $buttons['view']['active'] = true;
+            break;
+    }
+
+	ui_print_page_header (__("Monitor detail") . $subpage, "", false, "", true, $buttons);
+
+	if ($section == 'fields') {
+		require_once($config["homedir"] . '/godmode/agentes/status_monitor_custom_fields.php');
+		exit();
+	}
+
 } else {
     ui_meta_print_header(__('Monitor view'));
 }
@@ -1040,75 +1063,103 @@ if (!empty($result)) {
 	$table->cellspacing = 0;
 	$table->width = '100%';
 	$table->class = 'databox data';
-    $table->head = [];
-    $table->data = [];
-    $table->size = [];
-    $table->align = [];
+	$table->head = array ();
+	$table->data = array ();
+	$table->size = array ();
+	$table->align = array ();
 
-    if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+    $show_fields = explode (',', $config['status_monitor_fields']);
+
+
+	if (in_array('policy', $show_fields)) {
+		if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK)
 			$table->head[0] = '<span title=\'' . __('Policy') . '\'>' . __('P.') . '</span>';
 	}
 
+	if (in_array('agent', $show_fields) || is_metaconsole()) {
 		$table->head[1] = __('Agent');
-    $table->head[1] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=agent_alias&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectAgentNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=agent_alias&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectAgentNameDown, 'alt' => 'down']).'</a>';
+		$table->head[1] .=' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=agent_alias&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectAgentNameUp, 'alt' => 'up'))  . '</a>' .
+		'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=agent_alias&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectAgentNameDown, 'alt' => 'down')) . '</a>';
+	}
 
+	if (in_array('data_type', $show_fields) || is_metaconsole()) {
 		$table->head[2] = __('Data Type');
-    $table->head[2] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=type&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=type&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown, 'alt' => 'down']).'</a>';
+		$table->head[2] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=type&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectTypeUp, 'alt' => 'up'))  . '</a>' .
+		'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=type&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectTypeDown, 'alt' => 'down')) . '</a>';
 
 		$table->align[2] = 'left';
+	}
 
+	if (in_array('module_name', $show_fields) || is_metaconsole()) {
 		$table->head[3] = __('Module name');
-    $table->head[3] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=module_name&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=module_name&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).'</a>';
+		$table->head[3] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=module_name&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectModuleNameUp, 'alt' => 'up'))  . '</a>' .
+		'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=module_name&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectModuleNameDown, 'alt' => 'down')) . '</a>';
+	}
 
+	if (in_array('server_type', $show_fields) || is_metaconsole()) {
 		$table->head[4] = __('Server type');
-    $table->head[4] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=moduletype&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=moduletype&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).'</a>';
+		$table->head[4] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=moduletype&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectModuleNameUp, 'alt' => 'up'))  . '</a>' .
+		'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=moduletype&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectModuleNameDown, 'alt' => 'down')) . '</a>';
+	}
 
+	if (in_array('interval', $show_fields) || is_metaconsole()) {
 		$table->head[5] = __('Interval');
-    $table->head[5] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=interval&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=interval&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown, 'alt' => 'down']).'</a>';
+		$table->head[5] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=interval&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectIntervalUp, 'alt' => 'up'))  . '</a>' .
+		'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=interval&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectIntervalDown, 'alt' => 'down')) . '</a>';
 		$table->align[5] = 'left';
+	}
 
+	if (in_array('status', $show_fields) || is_metaconsole()) {
 		$table->head[6] = __('Status');
-    $table->head[6] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=status&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=status&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).'</a>';
+		$table->head[6] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=status&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectStatusUp, 'alt' => 'up'))  . '</a>' .
+		'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=status&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectStatusDown, 'alt' => 'down')) . '</a>';
 
 		$table->align[6] = 'left';
+	}
 
+	if (in_array('graph', $show_fields) || is_metaconsole()) {
 		$table->head[7] = __('Graph');
 		$table->align[7] = 'left';
+	}
 
+	if (in_array('warn', $show_fields) || is_metaconsole()) {
 		$table->head[8] = __('Warn');
 		$table->align[8] = 'left';
+	}
 
+	if (in_array('data', $show_fields) || is_metaconsole()) {
 		$table->head[9] = __('Data');
 		$table->align[9] = 'left';
 		if ( is_metaconsole() ) {
-        $table->head[9] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=data&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=data&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).'</a>';
+	       $table->head[9] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=data&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectStatusUp, 'alt' => 'up'))  . '</a>' .
+			'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=data&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectStatusDown, 'alt' => 'down')) . '</a>';
+		}
 	}
 
+	if (in_array('timestamp', $show_fields) || is_metaconsole()) {
 		$table->head[10] = __('Timestamp');
-    $table->head[10] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTimestampUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTimestampDown, 'alt' => 'down']).'</a>';
+		$table->head[10] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=timestamp&amp;sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectTimestampUp, 'alt' => 'up'))  . '</a>' .
+		'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype . '&amp;moduletype='.$moduletype . '&amp;refr=' . $refr . '&amp;modulegroup='.$modulegroup . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . $ag_custom_fields_params . '&amp;sort_field=timestamp&amp;sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectTimestampDown, 'alt' => 'down')) . '</a>';
 		$table->align[10] = 'left';
+	}
 
-    $id_type_web_content_string = db_get_value(
-        'id_tipo',
-        'ttipo_modulo',
-        'nombre',
-        'web_content_string'
-    );
+	if (in_array('to_critical', $show_fields)) {
+		$table->head[11] = __('Last status change');
+	}
+
+	$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',
+		//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,
-            ]
-        );
+			array('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
@@ -1121,7 +1172,9 @@ if (!empty($result)) {
 			$row['datos'] = io_safe_input($row['datos']);
 		}
 
-            $data = [];
+		$data = array ();
+
+		if (in_array('policy', $show_fields) || is_metaconsole()) {
 			if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 				if(is_metaconsole()){
 					$node = metaconsole_get_connection_by_id($row['server_id']);
@@ -1135,9 +1188,9 @@ if (!empty($result)) {
 
 				$policyInfo = policies_info_module_policy($row['id_agente_modulo']);
 
-            if ($policyInfo === false) {
+				if ($policyInfo === false)
 					$data[0] = '';
-            } else {
+				else {
 					$linked = policies_is_module_linked($row['id_agente_modulo']);
 
 					$adopt = false;
@@ -1149,24 +1202,31 @@ if (!empty($result)) {
 						if ($adopt) {
 							$img = 'images/policies_brick.png';
 							$title = __('(Adopt) ') . $policyInfo['name_policy'];
-                    } else {
+						}
+						else {
 							$img = 'images/policies.png';
 							$title = $policyInfo['name_policy'];
 						}
-                } else {
+					}
+					else {
 						if ($adopt) {
 							$img = 'images/policies_not_brick.png';
 							$title = __('(Unlinked) (Adopt) ') . $policyInfo['name_policy'];
-                    } else {
+						}
+						else {
 							$img = 'images/unlinkpolicy.png';
 							$title = __('(Unlinked) ') . $policyInfo['name_policy'];
 						}
 					}
-
 					if(is_metaconsole()){
-                    $data[0] = '<a href="?sec=gmodules&amp;sec2=advanced/policymanager&amp;id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
-                } else {
-                    $data[0] = '<a href="?sec=gmodules&amp;sec2=enterprise/godmode/policies/policies&amp;id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
+						$data[0] = '<a href="?sec=gmodules&amp;sec2=advanced/policymanager&amp;id=' . $policyInfo['id_policy'] . '">' . 
+							html_print_image($img,true, array('title' => $title)) .
+							'</a>';
+					}
+					else{
+						$data[0] = '<a href="?sec=gmodules&amp;sec2=enterprise/godmode/policies/policies&amp;id=' . $policyInfo['id_policy'] . '">' . 
+							html_print_image($img,true, array('title' => $title)) .
+							'</a>';
 					}
 				}
 
@@ -1174,35 +1234,43 @@ if (!empty($result)) {
 					metaconsole_restore_db();
 				}
 			}
+		}
 
+		if (in_array('agent', $show_fields) || is_metaconsole()) {
 			$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 = '<a href="'.$row['server_url'].'index.php?'.'sec=estado&amp;'.'sec2=operation/agentes/ver_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'loginhash=auto&amp;'.'loginhash_data='.$row['hashdata'].'&amp;'.'loginhash_user='.str_rot13($row['user']).'">';
-            $agent_alias = ui_print_truncate_text(
-                $agent_alias,
-                'agent_small',
-                false,
-                true,
-                false,
-                '[&hellip;]',
-                'font-size:7.5pt;'
-            );
+				$agent_link = '<a href="'.
+					$row['server_url'] .'index.php?' .
+						'sec=estado&amp;' .
+						'sec2=operation/agentes/ver_agente&amp;' .
+						'id_agente='. $row['id_agent'] . '&amp;' .
+						'loginhash=auto&amp;' .
+						'loginhash_data=' . $row['hashdata'] . '&amp;' .
+						'loginhash_user=' . str_rot13($row['user']) . '">';
+				$agent_alias = ui_print_truncate_text($agent_alias,
+					'agent_small', false, true, false, '[&hellip;]',
+					'font-size:7.5pt;');
 				if (can_user_access_node ()) {
 					$data[1] = $agent_link . '<b>' . $agent_alias . '</b></a>';
-            } else {
+				}
+				else {
 					$data[1] = $agent_alias;
 				}
-        } else {
+			}
+			else {
 				$data[1] = '<strong><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$row['id_agent'].'">';
 				$data[1] .= ui_print_truncate_text($agent_alias, 'agent_medium', false, true, false, '[&hellip;]', 'font-size:7.5pt;');
 				$data[1] .= '</a></strong>';
 			}
+		}
 		
-
+		if (in_array('data_type', $show_fields) || is_metaconsole()) {
 			$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']);
+			$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')) {
@@ -1210,157 +1278,148 @@ if (!empty($result)) {
 						$show_edit_icon = false;
 					}
 					
-                $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'tab=module&amp;'.'id_agent_module='.$row['id_agente_modulo'].'&amp;'.'edit_module=1'.'&amp;loginhash=auto&amp;loginhash_data='.$row['hashdata'].'&amp;loginhash_user='.str_rot13($row['user']);
-            } else {
-                $url_edit_module = 'index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'tab=module&amp;'.'id_agent_module='.$row['id_agente_modulo'].'&amp;'.'edit_module=1';
+					$url_edit_module = $row['server_url'] . 'index.php?' .
+						'sec=gagente&amp;' .
+						'sec2=godmode/agentes/configurar_agente&amp;' .
+						'id_agente=' . $row['id_agent'] . '&amp;' .
+						'tab=module&amp;' .
+						'id_agent_module=' . $row['id_agente_modulo'] . '&amp;' .
+						'edit_module=1' .
+						'&amp;loginhash=auto&amp;loginhash_data=' . $row['hashdata'] . '&amp;loginhash_user=' . str_rot13($row['user']);
+				}
+				else {
+					$url_edit_module = 'index.php?' .
+						'sec=gagente&amp;' .
+						'sec2=godmode/agentes/configurar_agente&amp;' .
+						'id_agente=' . $row['id_agent'] . '&amp;' .
+						'tab=module&amp;' .
+						'id_agent_module=' . $row['id_agente_modulo'] . '&amp;' .
+						'edit_module=1';
 				}
 				
 				if ($show_edit_icon) {
-                $data[2] .= '<a href="'.$url_edit_module.'">'.html_print_image(
-                    'images/config.png',
-                    true,
-                    [
-                        'alt'    => '0',
-                        'border' => '',
-                        'title'  => __('Edit'),
-                    ]
-                ).'</a>';
+					$data[2] .= '<a href="' . $url_edit_module . '">' .
+						html_print_image('images/config.png', true,
+							array('alt' => '0', 'border' => '', 'title' => __('Edit'))) .
+						'</a>';
+				}
 			}
 		}
 		
+		if (in_array('module_name', $show_fields) || is_metaconsole()) {
 			$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,
-                [
+				$data[3] .= html_print_image('/images/tag_red.png', true,
+					array(
 						'title' => $row['tags'],
-                    'style' => 'width: 20px; margin-left: 3px;',
-                ]
-            );
+						'style' => 'width: 20px; margin-left: 3px;'));
+			}
 		}
 
+		if (in_array('server_type', $show_fields) || is_metaconsole())
   		  $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
-                );
+  		if (in_array('interval', $show_fields) || is_metaconsole()) {
+			$data[5] = ($row['module_interval'] == 0) ?
+				human_time_description_raw($row['agent_interval'])
+				:
+				human_time_description_raw($row['module_interval']);
 		}
-        } 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
-                );
+		
+		if (in_array('status', $show_fields) || is_metaconsole()) {
+			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'] == 2) {
+			elseif ($row['estado'] == 0) {
 				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
-                                            );
+					$data[6] = ui_print_status_image(STATUS_MODULE_OK,
+						__('NORMAL') . ': ' . remove_right_zeros(number_format($row['datos'], $config['graph_precision'])), true);
 				}
-        } else {
+				else {
+					$data[6] = ui_print_status_image(STATUS_MODULE_OK,
+						__('NORMAL') . ': ' . $row['datos'], true);
+				}
+			}
+			elseif ($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);
+				}
+			}
+			elseif ($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']
-            );
+					$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
-                            );
+							$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
-                        );
+							$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
-                        );
+							$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] = '';
+		if (in_array('graph', $show_fields) || is_metaconsole()) {
+			$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 {
+			}
+			else {
 				$acl_graphs = true;
 			}
 			
@@ -1371,13 +1430,13 @@ if (!empty($result)) {
 				$handle = dechex(crc32($row['id_agente_modulo'].$row['module_name']));
 				$win_handle = 'day_'.$handle;
 				
-            $graph_params = [
+				$graph_params = array(
 						'type' => $graph_type,
 						'period' => SECONDS_1DAY,
 						'id' => $row['id_agente_modulo'],
 						'label' => base64_encode($row['module_name']),
-                'refresh' => SECONDS_10MINUTES,
-            ];
+						'refresh' => SECONDS_10MINUTES
+					);
 				
 				if (is_metaconsole() && isset($row['server_id'])) {
 					// Set the server id
@@ -1391,30 +1450,28 @@ if (!empty($result)) {
 				$data[7] = get_module_realtime_link_graph($row);
 
 				if(!is_snapshot_data($row['datos'])){
-                $data[7] .= '<a href="javascript:'.$link.'">'.html_print_image('images/chart_curve.png', true, ['border' => '0', 'alt' => '']).'</a>';
+					$data[7] .= '<a href="javascript:'.$link.'">' . html_print_image('images/chart_curve.png', true, array('border' => '0', 'alt' => '')) .  '</a>';
 				}
-
-            $data[7] .= '<a href="javascript: '.'show_module_detail_dialog('.$row['id_agente_modulo'].', '.$row['id_agent'].', \''.$row['server_name'].'\', 0, '.SECONDS_1DAY.', \''.$row['module_name'].'\')">'.html_print_image(
-                'images/binary.png',
-                true,
-                [
-                    'border' => '0',
-                    'alt'    => '',
-                ]
-            ).'</a>';
+				$data[7] .= '<a href="javascript: ' .
+					'show_module_detail_dialog(' .
+						$row['id_agente_modulo'] . ', '.
+						$row['id_agent'] . ', \'' .
+						$row['server_name'] . '\', 0, ' . SECONDS_1DAY . ', \'' . $row['module_name'] . '\')">' .
+					html_print_image ('images/binary.png', true,
+						array ('border' => '0', 'alt' => '')) . '</a>';
 						
 				$data[7] .= '<span id=\'hidden_name_module_' . $row['id_agente_modulo'] . '\'
-							style=\'display: none;\'>'.$row['module_name'].'</span>';
+								style=\'display: none;\'>' .
+								$row['module_name'] .
+							'</span>';
+			}
 		}
 
-        $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 (in_array('warn', $show_fields) || is_metaconsole()) {
+
+			$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'] ) {
@@ -1425,41 +1482,36 @@ if (!empty($result)) {
 							case 18:
 							case 21:
 							case 31:
-                        if ($row['datos'] >= 1) {
+								if ( $row['datos'] >= 1 ) 
 									$salida = $config['render_proc_ok'];
-                        } else {
+								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') {
+										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 {
+										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 {
+				}
+				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') {
+							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 {
+							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;
@@ -1477,19 +1529,21 @@ if (!empty($result)) {
 							$salida = ui_print_truncate_text($salida, 'agent_small', true, true, false, '[&hellip;]', 'font-size:7.5pt;');
 							//clean tag <i>
 							$text_aux = explode('<a',$salida);
-                        $match = preg_replace('/(&lt;i&gt;|&lt;\/i&gt;|&lt;i|&lt;\/i|i&gt;|\/i&gt;|&lt;|&gt;)/', '', $text_aux[0]);
+							$match = preg_replace('/(&lt;i&gt;|&lt;\/i&gt;|&lt;i|&lt;\/i|i&gt;|\/i&gt;|&lt;|&gt;)/', "", $text_aux[0]);
 							$salida = $match.'<a'.$text_aux[1];
 						} else {
 							$salida = ui_print_truncate_text($salida, 'agent_small', true, true, false, '[&hellip;]', 'font-size:7.5pt;');
 						}
 					}
 				}
-        } else {
+			}
+			else {
 				//Fixed the goliat sends the strings from web
 				//without HTML entities
 				if ($is_web_content_string) {
 					$module_value = $row['datos'];
-            } else {
+				}
+				else {
 					$module_value = io_safe_output($row['datos']);
 				}
 
@@ -1497,21 +1551,20 @@ if (!empty($result)) {
 				$is_large_image = is_text_to_black_string ( $module_value );
 
 				if (($config['command_snapshot']) && ($is_snapshot || $is_large_image)) {
-                $link = ui_get_snapshot_link(
-                    [
+					$link = ui_get_snapshot_link( array(
 						'id_module' => $row['id_agente_modulo'],
 						'interval' => $row['current_interval'],
 						'module_name' => $row['module_name'],
-                        'id_node'     => $row['server_id'],
-                    ]
-                );
+						'id_node' => $row['server_id']
+					));
 					$salida = ui_get_snapshot_image($link, $is_snapshot) . '&nbsp;&nbsp;';
 				} 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 {
+						}
+						else {
 							$data_macro = modules_get_unit_macro($row['datos'],$row['unit']);
 							if($data_macro) {
 								$salida = $data_macro;
@@ -1519,50 +1572,70 @@ if (!empty($result)) {
 								$salida = $row['datos'];
 							}
 						}
-                } else {
+					}
+					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 {
+						}
+						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 {
+							}
+							else {
 								$sub_string = substr(io_safe_output($row['datos']),0, 12);
 							}
 						}
 						
 						if ($module_value == $sub_string) {
 							$salida = $module_value;
-                    } else {
-                        $salida = '<span '."id='hidden_value_module_".$row['id_agente_modulo']."'
-							style='display: none;'>".$module_value.'</span>'.'<span '."id='value_module_".$row['id_agente_modulo']."'
-							title='".$module_value."' "."style='white-space: nowrap;'>".'<span id="value_module_text_'.$row['id_agente_modulo'].'">'.$sub_string.'</span> '."<a href='javascript: toggle_full_value(".$row['id_agente_modulo'].")'>".html_print_image('images/rosette.png', true).'</a></span>';
+						}
+						else {
+							$salida = "<span " .
+								"id='hidden_value_module_" . $row['id_agente_modulo'] . "'
+								style='display: none;'>" .
+								$module_value .
+								"</span>" . 
+								"<span " .
+								"id='value_module_" . $row['id_agente_modulo'] . "'
+								title='" . $module_value . "' " .
+								"style='white-space: nowrap;'>" . 
+								'<span id="value_module_text_' . $row['id_agente_modulo'] . '">' .
+									$sub_string . '</span> ' .
+								"<a href='javascript: toggle_full_value(" . $row['id_agente_modulo'] . ")'>" .
+									html_print_image('images/rosette.png', true) . '</a></span>';
+						}
 					}
 				}
 			}
 		}
 
+		if (in_array('data', $show_fields) || is_metaconsole())
 			$data[9] = $salida;
 		
-        if ($row['module_interval'] > 0) {
+		if (in_array('timestamp', $show_fields) || is_metaconsole()) {
+			if ($row['module_interval'] > 0)
 				$interval = $row['module_interval'];
-        } else {
+			else
 				$interval = $row['agent_interval'];
-        }
 			
 			if ($row['estado'] == 3) {
-            $option = [
-                'html_attr' => 'class="redb"',
-                'style'     => 'font-size:7pt;',
-            ];
-        } else {
-            $option = ['style' => 'font-size:7pt;'];
+				$option = array ('html_attr' => 'class="redb"','style' => 'font-size:7pt;');
+			}
+			else {
+				$option = array ('style' => 'font-size:7pt;');
+			}
+			$data[10] = ui_print_timestamp ($row['utimestamp'], true, $option);
 		}
 
-        $data[10] = ui_print_timestamp($row['utimestamp'], true, $option);
+		if (in_array('to_critical', $show_fields)) {
+
+				$change_status_timestamp = db_get_sql ('SELECT utimestamp FROM tevento WHERE id_agentmodule=' . $row['id_agente_modulo'] . ' ORDER BY utimestamp DESC');
+				$data[11] = ui_print_timestamp ($change_status_timestamp, true, $option);
+		}
 		
 		array_push ($table->data, $data);
 	}

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.731
-%define release     190222
+%define release     190225
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.731
-%define release     190222
+%define release     190225
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb_data.sql

@@ -85,6 +85,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('netflow_nfdump', '/usr/bin/nfdump'),
 ('netflow_max_resolution', '50'),
 ('event_fields', 'evento,id_agente,estado,timestamp'),
+('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'),
 ('list_ACL_IPs_for_API', '127.0.0.1'),
 ('enable_pass_policy', 0),
 ('pass_size', 4),

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.731-190222
+Version: 7.0NG.731-190225
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190222"
+pandora_version="7.0NG.731-190225"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.731";
-my $pandora_build = "190222";
+my $pandora_build = "190225";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.731";
-my $pandora_build = "190222";
+my $pandora_build = "190225";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.731
-%define release     190222
+%define release     190225
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.731
-%define release     190222
+%define release     190225
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190222"
+PI_BUILD="190225"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.731 PS190222";
+my $version = "7.0NG.731 PS190225";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.731 PS190222";
+my $version = "7.0NG.731 PS190225";
 
 # save program name for logging
 my $progname = basename($0);