diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf index 4ad837f943..e25a82a517 100644 --- a/pandora_agents/pc/Linux/pandora_agent.conf +++ b/pandora_agents/pc/Linux/pandora_agent.conf @@ -234,6 +234,21 @@ module_description Number of cron task files module_unit files module_end +# This module /var/log/syslog file, under the module name "syslog" +# And search for "ssh" string into it, sending only that information. +module_begin +module_name Syslog +module_description Search for ssh string into /var/log/syslog file +module_type log +module_regexp /var/log/syslog +module_pattern ssh +module_end + +#Hardening plugin for security compliance analysis. Enable to use it. +#module_begin +#module_plugin /usr/share/pandora_agent/plugins/pandora_hardening -t 150 +#module_absoluteinterval 7d +#module_end # Plugin example @@ -241,11 +256,6 @@ module_end module_plugin pandora_df -# This parses /var/log/syslog file, under the module name "syslog" -# And search for "ssh" string into it, sending only that information. - -module_plugin grep_log /var/log/syslog Syslog ssh - # Get disk space free in MB #module_begin #module_name disk_root_free @@ -270,7 +280,6 @@ module_plugin grep_log /var/log/syslog Syslog ssh #module_end # Plugin for inventory on the agent. - # module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users process ip route # Example of preconditions @@ -303,4 +312,13 @@ module_plugin grep_log /var/log/syslog Syslog ssh # This plugin runs several security checks in a Linux system -#module_plugin pandora_security_check \ No newline at end of file +#module_plugin pandora_security_check + +# Extraction module example +#module_begin +#module_name Collector +#module_description Logs extraction module +#module_type log +#module_regexp /var/log/logfile.log +#module_pattern .* +#module_end \ No newline at end of file diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index 621c1d24ac..27f0326da0 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -147,22 +147,23 @@ module_max_critical 20 module_end # Log events + +# Get logs from System source. module_begin module_name System Events (TermService) -module_type async_string -module_logevent module_description Log Events coming from Terminal Service +module_type log +module_logevent module_source System -module_application TermService module_end +# Get logs from Security source. module_begin -module_name Security Events (Invalid Login) -module_type async_string -module_description Security log events for invalid login attempt +module_name Security Events +module_description Security log events +module_type log module_logevent module_source Security -module_eventcode 529 module_end # Check if Dhcp service is enabled @@ -219,6 +220,12 @@ module_plugin cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\df.vbs" # module_description Free space on drive D: (%) # module_end +# Hardening plugin for security compliance analysis. +# module_begin +# module_plugin "%PROGRAMFILES%\Pandora_Agent\util\pandora_hardening.exe -t 150" +# module_absoluteinterval 7d +# module_end + # Sample of Windows inventory module (ONLY ENTERPRISE)! #module_begin #module_name Inventory @@ -344,4 +351,13 @@ module_plugin cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\df.vbs" #module_condition (3,8) cmd.exe /c echo range >> c:\log.txt #module_exec echo 5 #module_description Postcondition test module +#module_end + +# Example of collector module +#module_begin +#module_name Collector +#module_description Logs extraction module +#module_type log +#module_regexp /var/log/logfile.log +#module_pattern .* #module_end \ No newline at end of file diff --git a/pandora_agents/pc/pandora_agent b/pandora_agents/pc/pandora_agent index 67e603b225..88f78e31ac 100644 --- a/pandora_agents/pc/pandora_agent +++ b/pandora_agents/pc/pandora_agent @@ -2179,16 +2179,7 @@ sub configure ($) { #Launch tentacle server in proxy mode if configured if ($Conf{'proxy_mode'}) { - - #Check if user is root - if ($> != 0) { - if (launch_tentacle_proxy() != 0) { - return 1; - } - } else { - error ('Proxy mode can not be launched as root'); - return 1; - } + return 1 if (launch_tentacle_proxy() != 0); } # Add the plugins directory to the PATH diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index 98c137741e..49e8866f9a 100644 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -157,12 +157,32 @@ module_exec last | head -1 module_description Last Login module_end -# Plugin example +#Hardening plugin for security compliance analysis. Enable to use it. +#module_begin +#module_plugin /usr/share/pandora_agent/plugins/pandora_hardening -t 150 +#module_absoluteinterval 7d +#module_end -# This parses /var/log/syslog file, under the module name "syslog" +# This module parses /var/log/syslog file, under the module name "syslog" # And search for "ssh" string into it, sending only that information. +module_begin +module_name Syslog +module_description Search for ssh string into /var/log/syslog file +module_type log +module_regexp /var/log/syslog +module_pattern ssh +module_end -module_plugin grep_log /var/log/syslog Syslog ssh +# Plugin example # Plugin for inventory on the agent. # module_plugin inventory 1 cpu ram video nic hd cdrom software + +# Extraction module example +#module_begin +#module_name Collector +#module_description Logs extraction module +#module_type log +#module_regexp /var/log/logfile.log +#module_pattern .* +#module_end \ No newline at end of file diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index b4b3c35ac8..ba9c0079a3 100644 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -372,13 +372,32 @@ module_end #module_description XGrid #module_end +#Hardening plugin for security compliance analysis. Enable to use it. +#module_begin +#module_plugin /usr/share/pandora_agent/plugins/pandora_hardening -t 150 +#module_absoluteinterval 7d +#module_end + +# This module parses /var/log/syslog file, under the module name "syslog" +# And search for "ssh" string into it, sending only that information. +module_begin +module_name Syslog +module_description Log collection modules +module_type log +module_regexp /var/log/syslog +module_pattern ssh +module_end + # Plugin example -# This parses /var/log/syslog file, under the module name "syslog" -# And search for "ssh" string into it, sending only that information. - -#module_plugin grep_log /var/log/syslog Syslog ssh - # Plugin for inventory on the agent. - # module_plugin inventory 1 cpu ram video nic hd cdrom software + +# Extraction module example +#module_begin +#module_name Collector +#module_description Logs extraction module +#module_type log +#module_regexp /var/log/logfile.log +#module_pattern .* +#module_end \ No newline at end of file diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 516095201c..f8b810d817 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.774-231205 +Version: 7.0NG.774-231213 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index db2417bcc0..fe934f5bb2 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/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.774-231205" +pandora_version="7.0NG.774-231213" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index 10458ddba5..42fddd39f5 100644 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -271,11 +271,17 @@ module_plugin pandora_netusage module_plugin autodiscover --default # Plugin for inventory on the agent. -#module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route +# module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route # Log collection modules. This will collect log files for forensic analysis and store everything # This is for LOG monitoring. Different than log monitoring. -#module_plugin grep_log_module /var/log/messages Syslog \.\* +module_begin +module_name Syslog +module_description Log collection modules +module_type log +module_regexp /var/log/messages +module_pattern .* +module_end # Another samples of monitoring modules @@ -317,9 +323,9 @@ module_plugin autodiscover --default #module_absoluteinterval 7d #module_end -# Logs extraction +# Extraction module example #module_begin -#module_name Syslog +#module_name Collector #module_description Logs extraction module #module_type log #module_regexp /var/log/logfile.log diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index dd6b68b3a1..263b12b006 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.774'; -use constant AGENT_BUILD => '231205'; +use constant AGENT_BUILD => '231213'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; @@ -4436,14 +4436,7 @@ my $PID = $$; #Launch tentacle server in proxy mode if configured if ($Conf{'proxy_mode'}) { - - #Check if user is root - if ($> != 0) { - launch_tentacle_proxy(); - } else { - log_message ('error', 'Proxy mode can not be launched as root'); - exit 1; - } + launch_tentacle_proxy(); } # Advice if YAML::Tiny is allowed in this system diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 0e7014287e..c8b79b5432 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.774 -%define release 231205 +%define release 231213 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 2c4ee352e4..e15c66a2b0 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.774 -%define release 231205 +%define release 231213 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 3e45b4325c..c8b9c5bab9 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.774 -%define release 231205 +%define release 231213 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 0629789841..54311de34a 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.774 -%define release 231205 +%define release 231213 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 45dff8f0bf..bfeb6b46be 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.774 -%define release 231205 +%define release 231213 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 8ada865d04..ccd8e1bbe9 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.774" -PI_BUILD="231205" +PI_BUILD="231213" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index bae2841fd5..c0a1560b38 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -179,6 +179,22 @@ module_description Total number of TCP connections active module_group Networking module_end +# Get logs from System source. +module_begin +module_name Eventlog_System +module_type log +module_logevent +module_source System +module_end + +# Get logs from Security source. +module_begin +module_name Eventlog_Security +module_type log +module_logevent +module_source Security +module_end + # Example plugin to retrieve drive usage module_plugin cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\df_percent_used.vbs" @@ -273,22 +289,6 @@ module_plugin "%PROGRAMFILES%\Pandora_Agent\util\autodiscover.exe" --default #module_type generic_data_string #module_end -# Get logs from System source. Need enterprise version. -#module_begin -#module_name Eventlog_System -#module_type log -#module_logevent -#module_source System -#module_end - -# Get logs from Security source. Need enterprise version. -#module_begin -#module_name Eventlog_Security -#module_type log -#module_logevent -#module_source Security -#module_end - # Get logs from Application source. Need enterprise version. #module_begin #module_name Eventlog_Application diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 6b0fb53ca1..af055f92d2 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{231205} +{231213} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 77604cfe02..0c717e94de 100644 --- a/pandora_agents/win32/pandora.cc +++ b/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.774 Build 231205") +#define PANDORA_VERSION ("7.0NG.774 Build 231213") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 5106a9c650..d0c4b12420 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.774(Build 231205))" + VALUE "ProductVersion", "(7.0NG.774(Build 231213))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 16c44a9fe0..3db8b82868 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.774-231205 +Version: 7.0NG.774-231213 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 539c8a813d..ed5bacf153 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/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.774-231205" +pandora_version="7.0NG.774-231213" package_pear=0 package_pandora=1 diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index b3b9463ee6..a5dcf2cb0d 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -183,7 +183,9 @@ if (isset($config['force_instant_logout']) === true $_SESSION = []; session_destroy(); header_remove('Set-Cookie'); - setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/'); + if (isset($_COOKIE[session_name()]) === true) { + setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/'); + } if ($config['auth'] === 'saml' && empty($public_hash) === true) { include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php'; diff --git a/pandora_console/extensions/agents_modules_csv.php b/pandora_console/extensions/agents_modules_csv.php index e4a331338f..35893b4414 100644 --- a/pandora_console/extensions/agents_modules_csv.php +++ b/pandora_console/extensions/agents_modules_csv.php @@ -34,11 +34,11 @@ if ((bool) $config['metaconsole']) { include_once $config['homedir'].'/include/functions_modules.php'; include_once $config['homedir'].'/include/functions_users.php'; } else { - include_once '../include/config.php'; - include_once '../include/functions_agents.php'; - include_once '../include/functions_reporting.php'; - include_once '../include/functions_modules.php'; - include_once '../include/functions_users.php'; + include_once __DIR__.'/../include/config.php'; + include_once __DIR__.'/../include/functions_agents.php'; + include_once __DIR__.'/../include/functions_reporting.php'; + include_once __DIR__.'/../include/functions_modules.php'; + include_once __DIR__.'/../include/functions_users.php'; } diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php index e63b719cfe..202000e0bf 100644 --- a/pandora_console/extensions/pandora_logs.php +++ b/pandora_console/extensions/pandora_logs.php @@ -31,7 +31,7 @@ function view_logfile($file_name, $toggle=false) } else { $file_size = filesize($file_name); - if ($memory_limit < $file_size) { + if ($memory_limit < $file_size && $memory_limit !== '-1') { $code .= '
'.$file_name.' ('.__('File is too large than PHP memory allocated in the system.').')
';
             $code .= '
'.__('The preview file is imposible.').'
';
         } else if ($file_size > ($config['max_log_size'] * 1000)) {
@@ -117,6 +117,7 @@ function pandoralogs_extension_main()
         view_logfile($config['homedir'].'/log/console.log', true);
     }
 
+    view_logfile('/var/log/php-fpm/www-error.log', true);
     view_logfile($logs_directory.'/pandora_server.log', true);
     view_logfile($logs_directory.'/pandora_server.error', true);
 
diff --git a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini
index 6323aec140..c0cee7d03f 100644
--- a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini
+++ b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini
@@ -1,4 +1,4 @@
-pandorafms.vmware=9959cc3e5cc6bfcfadd6d05b56d4a11b
+pandorafms.vmware=248788e0fb2cd4e11623e4a52ee7d05b
 pandorafms.mysql=fadb4750d18285c0eca34f47c6aa3cfe
 pandorafms.mssql=1cc215409741d19080269ffba112810e
 pandorafms.oracle=2d9320a514d1e48a0b2804e1653c31c6
diff --git a/pandora_console/extras/mr/67.sql b/pandora_console/extras/mr/67.sql
index fe022e45e3..06253a5f54 100644
--- a/pandora_console/extras/mr/67.sql
+++ b/pandora_console/extras/mr/67.sql
@@ -3,25 +3,31 @@ START TRANSACTION;
 ALTER TABLE `tevento`
 ADD COLUMN `event_custom_id` TEXT NULL AFTER `module_status`;
 
--- Telegram and vonage default alerts
-UPDATE talert_actions
-	SET field2='[PANDORA] Alert FIRED on _agent_ / _module_ / _timestamp_ / _data_'
-	WHERE id=9;
-UPDATE talert_actions
-	SET field2='[PANDORA] Alert FIRED on _agent_ / _module_ / _timestamp_ / _data_'
-	WHERE id=11;
+SET @exist = (SELECT count(*) FROM information_schema.columns WHERE TABLE_NAME='tmetaconsole_agent' AND COLUMN_NAME='transactional_agent' AND table_schema = DATABASE());
+SET @sqlstmt = IF (@exist>0, 'ALTER TABLE `tmetaconsole_agent` DROP COLUMN `transactional_agent`', 'SELECT ""');
+prepare stmt from @sqlstmt;
+execute stmt;
+
+SET @exist = (SELECT count(*) FROM information_schema.columns WHERE TABLE_NAME='tagente' AND COLUMN_NAME='transactional_agent' AND table_schema = DATABASE());
+SET @sqlstmt = IF (@exist>0, 'ALTER TABLE `tagente` DROP COLUMN `transactional_agent`', 'SELECT ""');
+prepare stmt from @sqlstmt;
+execute stmt;
+
+ALTER TABLE `tdashboard`
+ADD COLUMN `date_range` TINYINT NOT NULL DEFAULT 0 AFTER `cells_slideshow`,
+ADD COLUMN `date_from` INT NOT NULL DEFAULT 0 AFTER `date_range`,
+ADD COLUMN `date_to` INT NOT NULL DEFAULT 0 AFTER `date_from`;
+
 -- Delete table tagent_access
-DROP TABLE tagent_access;
+DROP TABLE IF EXISTS tagent_access;
 
 ALTER TABLE `tevent_rule` DROP COLUMN `user_comment`;
 ALTER TABLE `tevent_rule` DROP COLUMN `operator_user_comment`;
 
 ALTER TABLE treport_content ADD check_unknowns_graph tinyint DEFAULT 0 NULL;
 
-ALTER TABLE `tevent_filter`
-ADD COLUMN `regex` TEXT NULL AFTER `private_filter_user`;
+ALTER TABLE `tevent_filter` ADD COLUMN `regex` TEXT NULL AFTER `private_filter_user`;
 -- Update macros for plugin oracle
-
 UPDATE `tdiscovery_apps` SET `version` = '1.1' WHERE `short_name` = 'pandorafms.oracle';
 
 SET @id_app := (SELECT `id_app` FROM `tdiscovery_apps` WHERE `short_name` = 'pandorafms.oracle');
@@ -35,11 +41,6 @@ UPDATE `trecon_task` SET `setup_complete` = 1 WHERE `id_app` = @id_app;
 -- Update lts updates
 UPDATE tconfig SET value='1' WHERE token='lts_updates';
 
-ALTER TABLE `tdashboard`
-ADD COLUMN `date_range` TINYINT NOT NULL DEFAULT 0 AFTER `cells_slideshow`,
-ADD COLUMN `date_from` INT NOT NULL DEFAULT 0 AFTER `date_range`,
-ADD COLUMN `date_to` INT NOT NULL DEFAULT 0 AFTER `date_from`;
-
 SELECT @generic_data := `id_tipo` FROM `ttipo_modulo` WHERE `nombre` = "generic_data";
 SELECT @generic_proc := `id_tipo` FROM `ttipo_modulo` WHERE `nombre` = "generic_proc";
 SELECT @async_data := `id_tipo` FROM `ttipo_modulo` WHERE `nombre` = "async_data";
@@ -47,4 +48,10 @@ SELECT @async_proc := `id_tipo` FROM `ttipo_modulo` WHERE `nombre` = "async_proc
 UPDATE `tagente_modulo` INNER JOIN `tservice` ON `tagente_modulo`.`custom_integer_1` = `tservice`.`id` SET `tagente_modulo`.`id_tipo_modulo` = @generic_data WHERE `tagente_modulo`.`id_tipo_modulo` = @async_data;
 UPDATE `tagente_modulo` INNER JOIN `tservice` ON `tagente_modulo`.`custom_integer_1` = `tservice`.`id` SET `tagente_modulo`.`id_tipo_modulo` = @generic_proc WHERE `tagente_modulo`.`id_tipo_modulo` = @async_proc;
 
+-- Telegram and vonage default alerts
+UPDATE talert_actions SET field2='[PANDORA] Alert FIRED on _agent_ / _module_ / _timestamp_ / _data_' WHERE id=9;
+UPDATE talert_actions SET field2='[PANDORA] Alert FIRED on _agent_ / _module_ / _timestamp_ / _data_' WHERE id=11;
+
+UPDATE `tdiscovery_apps` SET `version` = '1.2' WHERE `short_name` = 'pandorafms.vmware';
+
 COMMIT;
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 28311371bf..102d8e3136 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -35,7 +35,7 @@ echo sprintf('
', $menuTypeClass);
             $notifications_numbers['last_id']
         ).'
';
         $header_welcome = '';
-        if (check_acl($config['id_user'], $group, 'AW')) {
+        if (check_acl($config['id_user'], 0, 'AW')) {
             $header_welcome .= '
';
             $header_welcome .= html_print_image(
                 'images/wizard@svg.svg',
@@ -455,19 +455,28 @@ echo sprintf('
', $menuTypeClass);
         );
         $header_logout .= '
';
 
+        if (enterprise_installed()) {
+            $subtitle_header = $config['custom_subtitle_header'];
+            $class_header = '';
+        } else {
+            $subtitle_header = __('the Flexible Monitoring System (OpenSource version)');
+            echo '';
+            $class_header = 'underline-hover modal_module_list';
+        }
+
         if (is_reporting_console_node() === true) {
-            echo '
';
+            echo '
';
                 echo '';
                 echo $config['custom_title_header'];
                 echo '';
                 echo '';
-                echo $config['custom_subtitle_header'];
+                echo $subtitle_header;
                 echo '';
             echo '
';
             echo '
';
             echo '
'.$modal_help, $header_user, $header_logout.'
';
         } else {
-            echo '
'.$config['custom_title_header'].''.$config['custom_subtitle_header'].'

+            echo '
'.$config['custom_title_header'].''.$subtitle_header.'

             
'.$header_searchbar.'

             
'.$header_autorefresh, $header_autorefresh_counter, $header_discovery, $header_welcome, $servers_list, $modal_help, $header_setup, $header_user, $header_logout.'
';
         }
@@ -916,6 +925,46 @@ echo sprintf('
', $menuTypeClass);
 
     $(document).ready (function () {
 
+        
+            $('.header_left').on('click', function(){
+                // Hidden  tips modal.
+                $(".window").css("display", "none");
+                jQuery.post(
+                    "ajax.php",
+                    {
+                        page: "include/functions_menu",
+                        'why_enterprise': "true"
+                    },
+                    function(data) {
+                        if (data) {
+                            $("#dialog_why_enterprise").html(data);
+                            // Open dialog
+                            $("#dialog_why_enterprise").dialog({
+                                resizable: false,
+                                draggable: false,
+                                modal: true,
+                                show: {
+                                    effect: "fade",
+                                    duration: 200
+                                },
+                                hide: {
+                                    effect: "fade",
+                                    duration: 200
+                                },
+                                closeOnEscape: true,
+                                width: 700,
+                                height: 450,
+                                close: function(){
+                                    $('#dialog_why_enterprise').html('');
+                                }
+                            });
+                        }
+                    },
+                    "html"
+                );
+            });
+        
+
         // Check new notifications on a periodic way
         setInterval(check_new_notifications, 60000);
 
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 487fe54e07..5ea31914c6 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -566,10 +566,10 @@ if ($search != '') {
     if ($id != '') {
         $aux = $id[0]['id_agent'];
         $search_sql = sprintf(
-            ' AND ( nombre LIKE "%%%s%%"
-             OR alias LIKE "%%%s%%"
-             OR comentarios LIKE "%%%s%%"
-			 OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%")
+            ' AND ( REPLACE(nombre, " ", " ") LIKE "%%%s%%"
+             OR REPLACE(alias, " ", " ") LIKE "%%%s%%"
+             OR REPLACE(comentarios, " ", " ") LIKE "%%%s%%"
+			 OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND REPLACE(description, " ", " ") LIKE "%%%s%%")
              OR tagente.id_agente = %d',
             $search,
             $search,
@@ -591,10 +591,10 @@ if ($search != '') {
         $search_sql .= ')';
     } else {
         $search_sql = sprintf(
-            ' AND ( nombre
-			 LIKE "%%%s%%" OR alias
-			 LIKE "%%%s%%" OR comentarios LIKE "%%%s%%"
-			 OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%"))',
+            ' AND ( REPLACE(nombre, " ", " ")
+			 LIKE "%%%s%%" OR REPLACE(alias, " ", " ")
+			 LIKE "%%%s%%" OR REPLACE(comentarios, " ", " ") LIKE "%%%s%%"
+			 OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND REPLACE(description, " ", " ") LIKE "%%%s%%"))',
             $search,
             $search,
             $search,
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index c3772c00d3..b4cd0e2351 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -575,7 +575,7 @@ $where = sprintf('delete_pending = 0 AND id_agente = %s', $id_agente);
 $search_string_entities = io_safe_input($search_string);
 
 $basic_where = sprintf(
-    "(nombre LIKE '%%%s%%' OR nombre LIKE '%%%s%%' OR descripcion LIKE '%%%s%%' OR descripcion LIKE '%%%s%%') AND",
+    "(REPLACE(nombre, ' ', ' ')  LIKE '%%%s%%' OR REPLACE(nombre, ' ', ' ') LIKE '%%%s%%' OR REPLACE(descripcion, ' ', ' ') LIKE '%%%s%%' OR REPLACE(descripcion, ' ', ' ') LIKE '%%%s%%') AND",
     $search_string,
     $search_string_entities,
     $search_string,
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index 524ab245fb..cc9ed5d5f0 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -243,10 +243,15 @@ switch ($action) {
         $map_default_altitude = get_parameter('map_default_altitude');
         $map_group_id = get_parameter('map_group_id');
         $map_levels_zoom = get_parameter('map_levels_zoom', 16);
-
         $map_connection_list_temp = explode(',', get_parameter('map_connection_list'));
+        $map_connection_list_temp_string = implode(',', $map_connection_list_temp);
+        if (strlen($map_connection_list_temp_string) > 0) {
+            $where_map_connection = ' WHERE id_tmap_connection IN('.$map_connection_list_temp_string.')';
+        } else {
+            $where_map_connection = '';
+        }
 
-        $listConnectionTemp = db_get_all_rows_sql('SELECT id_tmap_connection, conection_name, group_id FROM tgis_map_connection');
+        $listConnectionTemp = db_get_all_rows_sql('SELECT id_tmap_connection, conection_name, group_id FROM tgis_map_connection'.$where_map_connection);
 
         foreach ($map_connection_list_temp as $index => $value) {
             $cleanValue = trim($value);
@@ -256,7 +261,6 @@ switch ($action) {
         }
 
         $map_connection_default = get_parameter('map_connection_default');
-
         $map_connection_list = [];
         foreach ($listConnectionTemp as $idMapConnection) {
             $default = 0;
@@ -345,7 +349,7 @@ function deleteConnectionMap(idConnectionMap) {
     
     checked = $("#radiobtn0001", $("#map_connection_" + idConnectionMap)).attr('checked');
     $("#map_connection_" + idConnectionMap).remove();
-    
+
     if (checked) {
         //Checked first, but not is index = 0 maybe.
         
@@ -485,7 +489,7 @@ foreach ($listConnectionTemp as $connectionTemp) {
 $table->data[1][0] = __('Add Map connection').$iconError;
 $table->data[1][1] = "
-        
-                    
+                     0) {
+    ob_end_flush();
 }
\ No newline at end of file
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index cb394d0c1b..b9ed066d68 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231205
+%define release     231213
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index ab0d19066e..defda9ef4d 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231205
+%define release     231213
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index d725c07e4a..7729b27053 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231205
+%define release     231213
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index fca9535e63..dd9e4c3ab3 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -290,16 +290,6 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
 ) ENGINE=InnoDB  DEFAULT CHARSET=UTF8MB4;
 -- snmp_oid is also used for WMI query
 
--- -----------------------------------------------------
--- Table `tagent_access`
--- -----------------------------------------------------
--- CREATE TABLE IF NOT EXISTS `tagent_access` (
---   `id_agent` INT UNSIGNED NOT NULL DEFAULT 0,
---   `utimestamp` BIGINT NOT NULL DEFAULT 0,
---   KEY `agent_index` (`id_agent`),
---   KEY `idx_utimestamp` USING BTREE (`utimestamp`)
--- ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-
 -- -----------------------------------------------------
 -- Table `talert_snmp`
 -- -----------------------------------------------------
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 28605959ed..70f9451932 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -2730,7 +2730,7 @@ SET @short_name = 'pandorafms.vmware';
 SET @name = 'VMware';
 SET @section = 'app';
 SET @description = 'Monitor ESXi hosts, datastores and VMs from a specific datacenter';
-SET @version = '1.1';
+SET @version = '1.2';
 INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
 SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;
 
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 5646fc2bc9..11123e2837 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231205
+Version: 7.0NG.774-231213
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 38c79af777..256a8b478f 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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.774-231205"
+pandora_version="7.0NG.774-231213"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 9e358948c4..64f526f08a 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231205";
+my $pandora_build = "231213";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 673ccce1f0..84d3d51bd2 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -5786,9 +5786,9 @@ sub pandora_inhibit_alerts {
 sub pandora_cps_enabled($$) {
 	my ($agent, $module) = @_;
 
-	return 1 if ($agent->{'cps'} > 0);
+	return 1 if ($agent->{'cps'} >= 0);
 
-	return 1 if ($module->{'cps'} > 0);
+	return 1 if ($module->{'cps'} >= 0);
 
 	return 0;
 }
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index a9d7a94574..f069b2710f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231205";
+my $pandora_build = "231213";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index ea580fdac8..3d44ddc426 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231205
+%define release     231213
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2ce48dd7cb..0bad40c2b6 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231205
+%define release     231213
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 28cf2f6746..8dcdf85db0 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231205"
+PI_BUILD="231213"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 5b16684570..0b74326632 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231205";
+my $version = "7.0NG.774 Build 231213";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f1d150756b..afcf8b9199 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/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.774 Build 231205";
+my $version = "7.0NG.774 Build 231213";
 
 # save program name for logging
 my $progname = basename($0);
diff --git a/visual_console_client/src/main.css b/visual_console_client/src/main.css
index cd8b00e93f..c77bf658c8 100644
--- a/visual_console_client/src/main.css
+++ b/visual_console_client/src/main.css
@@ -742,3 +742,7 @@ p {
   margin-block-start: 1em;
   margin-block-end: 1em;
 }
+
+strong {
+  font-size: inherit;
+}


 	
".html_print_select($listConnection, 'map_connection_list', '', '', '', '0', true)."
+        ".html_print_select($listConnection, 'select-map_connection_list', '', '', '', '0', true)."
 		
 		
 			".html_print_image(
diff --git a/pandora_console/godmode/massive/massive_delete_action_alerts.php b/pandora_console/godmode/massive/massive_delete_action_alerts.php
index cad37a3a29..0cd712e124 100644
--- a/pandora_console/godmode/massive/massive_delete_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_action_alerts.php
@@ -111,7 +111,8 @@ if ($delete) {
                 $alerts_agent_modules = [];
                 foreach ($agent_alerts['simple'] as $agent_alert) {
                     if ((in_array($agent_alert['id_alert_template'], $id_alert_templates)) && (in_array($agent_alert['id_agent_module'], $modules_id))) {
-                        $alerts_agent_modules = array_merge($alerts_agent_modules, alerts_get_alerts_agent_module($agent_alert['id_agent_module'], true, false, 'id'));
+                        // $alerts_agent_modules = array_merge($alerts_agent_modules, alerts_get_alerts_agent_module($agent_alert['id_agent_module'], true, false, 'id'));
+                        $alerts_agent_modules[] = $agent_alert['id'];
                     }
                 }
 
@@ -126,7 +127,7 @@ if ($delete) {
                     $agent_module_actions = [];
 
                     foreach ($alerts_agent_modules as $alert_agent_module) {
-                        $agent_module_actions = alerts_get_alert_agent_module_actions($alert_agent_module['id'], ['id', 'id_alert_action']);
+                        $agent_module_actions = alerts_get_alert_agent_module_actions($alert_agent_module, ['id', 'id_alert_action']);
 
                         foreach ($agent_module_actions as $agent_module_action) {
                             foreach ($actions as $action) {
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 171e16870b..ace5659ce7 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -478,8 +478,8 @@ if ($access_console_node === true) {
             }
         }
 
-        $sub2['godmode/setup/setup§ion=ehorus']['text'] = __('Pandora RC');
-        $sub2['godmode/setup/setup§ion=ehorus']['refr'] = 0;
+        $sub2['godmode/setup/setup§ion=pandorarc']['text'] = __('Pandora RC');
+        $sub2['godmode/setup/setup§ion=pandorarc']['refr'] = 0;
 
         $sub2['godmode/setup/setup§ion=ITSM']['text'] = __('ITSM');
         $sub2['godmode/setup/setup§ion=ITSM']['refr'] = 0;
@@ -575,12 +575,13 @@ if ($access_console_node === true) {
                 continue;
             }
 
+            $extmenu = [];
             if ($extension['godmode_menu']['name'] !== __('DB Schema check') && $extension['godmode_menu']['name'] !== __('DB interface')) {
                 $extmenu = $extension['godmode_menu'];
             }
 
             // Check the ACL for this user.
-            if ((bool) check_acl($config['id_user'], 0, $extmenu['acl']) === false) {
+            if ((bool) check_acl($config['id_user'], 0, ($extmenu['acl'] ?? '')) === false) {
                 continue;
             }
 
@@ -732,7 +733,7 @@ if ((bool) $config['pure'] === false) {
 
 echo '
';
 // Need to be here because the translate string.
-if (check_acl($config['id_user'], $group, 'AW')) {
+if (check_acl($config['id_user'], 0, 'AW')) {
     ?>
 
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index bcfb6f99c9..7c04892524 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -78,6 +78,7 @@ $action = get_parameterBetweenListValues(
         'update',
         'delete',
         'multiple_delete',
+        'update_json',
     ],
     'new'
 );
@@ -526,6 +527,110 @@ switch ($activeTab) {
                 }
             break;
 
+            case 'update_json':
+                // Update background.
+                $background = get_parameter('background');
+                $width = get_parameter('background_width');
+                $height = get_parameter('background_height');
+
+                if ($width == 0 && $height == 0) {
+                    $sizeBackground = getimagesize(
+                        $config['homedir'].'/images/console/background/'.$background
+                    );
+                    $width = $sizeBackground[0];
+                    $height = $sizeBackground[1];
+                }
+
+                db_process_sql_update(
+                    'tlayout',
+                    [
+                        'background' => $background,
+                        'width'      => $width,
+                        'height'     => $height,
+                    ],
+                    ['id' => $idVisualConsole]
+                );
+
+                // Return the updated visual console.
+                $visualConsole = db_get_row_filter(
+                    'tlayout',
+                    ['id' => $idVisualConsole]
+                );
+
+                // Update elements in visual map.
+                $idsElements = db_get_all_rows_filter(
+                    'tlayout_data',
+                    ['id_layout' => $idVisualConsole],
+                    [
+                        'id',
+                        'type',
+                    ]
+                );
+
+                $array_update = json_decode(io_safe_output(get_parameter('array_update')), true);
+
+                if (count($array_update)) {
+                    foreach ($array_update as $row) {
+                        $id = $row['id'];
+                        $values = [];
+                        $values['label'] = $row['label'];
+                        $values['image'] = $row['image'];
+                        $values['width'] = $row['width'];
+                        $values['height'] = $row['height'];
+                        $values['pos_x'] = $row['pos_x'];
+                        $values['pos_y'] = $row['pos_y'];
+
+                        switch ($row['rowtype']) {
+                            case NETWORK_LINK:
+                            case LINE_ITEM:
+                            continue 2;
+
+                            break;
+
+                            case SIMPLE_VALUE_MAX:
+                            case SIMPLE_VALUE_MIN:
+                            case SIMPLE_VALUE_AVG:
+                                $values['period'] = $row['period'];
+                            break;
+
+                            case MODULE_GRAPH:
+                                $values['period'] = $row['period'];
+                                unset($values['image']);
+                            break;
+
+                            case GROUP_ITEM:
+                                $values['id_group'] = $row['group'];
+                            break;
+
+                            case CIRCULAR_PROGRESS_BAR:
+                            case CIRCULAR_INTERIOR_PROGRESS_BAR:
+                            case PERCENTILE_BUBBLE:
+                            case PERCENTILE_BAR:
+                                unset($values['height']);
+                            break;
+                        }
+
+                        if (defined('METACONSOLE')) {
+                            $values['id_metaconsole'] = $row['id_server'];
+                        }
+
+                        $values['id_agent'] = $row['agent'];
+                        $values['id_agente_modulo'] = $row['module'];
+                        $values['id_custom_graph'] = $row['custom_graph'];
+                        $values['parent_item'] = $row['parent'];
+                        $values['id_layout_linked'] = $row['map_linked'];
+
+                        if (enterprise_installed()) {
+                            enterprise_visual_map_update_action_from_list_elements($row['rowtype'], $values, $id);
+                        }
+
+                        db_process_sql_update('tlayout_data', $values, ['id' => $id]);
+                    }
+
+                    return true;
+                }
+            break;
+
             case 'delete':
                 $id_element = get_parameter('id_element');
                 $result = db_process_sql_delete('tlayout_data', ['id' => $id_element]);
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 0f3b494fc5..1de74e1123 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -184,7 +184,7 @@ $buttons['ITSM'] = [
 
 $buttons['ehorus'] = [
     'active' => false,
-    'text'   => ''.html_print_image(
+    'text'   => ''.html_print_image(
         'images/RC.png',
         true,
         [
@@ -297,7 +297,7 @@ switch ($section) {
         $help_header = 'setup_flow_tab';
     break;
 
-    case 'ehorus':
+    case 'pandorarc':
         $buttons['ehorus']['active'] = true;
         $subpage = __('Pandora RC');
         $help_header = 'setup_ehorus_tab';
@@ -442,7 +442,7 @@ switch ($section) {
         include_once $config['homedir'].'/godmode/setup/setup_visuals.php';
     break;
 
-    case 'ehorus':
+    case 'pandorarc':
         include_once $config['homedir'].'/godmode/setup/setup_ehorus.php';
     break;
 
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index 56596af445..0da72eacb0 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -1113,9 +1113,9 @@ $(document).ready (function () {
                 id_imodule = $(value).attr('value');
                 $("select[name='inventory_changes_blacklist[]']")
                     .append(
-                        $("")
+                        $("")
                             .val(id_imodule)
-                            .html('' + imodule_name + '')
+                            .text(imodule_name)
                     );
                 $("#inventory_changes_blacklist_out")
                     .find("option[value='" + id_imodule + "']").remove();
@@ -1141,7 +1141,7 @@ $(document).ready (function () {
                         .append(
                             $("")
                                 .val(id_imodule)
-                                .html('' + imodule_name + '')
+                                .text(imodule_name)
                         );
                     $("#inventory_changes_blacklist")
                         .find("option[value='" + id_imodule + "']").remove();
@@ -1157,12 +1157,15 @@ $(document).ready (function () {
                     }
                 }
         });
+
+        $("#inventory_changes_blacklist > option").each(function(key, value) {
+            $(value).prop('selected',true).trigger('change');
+        });
+
     });
 
-    $("#submit-update_button").click(function () {
-        $('#inventory_changes_blacklist option').map(function(){
-            $(this).prop('selected', true);
-        });
+    $("#inventory_changes_blacklist > option").each(function(key, value) {
+        $(value).prop('selected',true).trigger('change');
     });
 });
 
diff --git a/pandora_console/images/widgets/service_level.png b/pandora_console/images/widgets/service_level.png
new file mode 100644
index 0000000000..685744641f
Binary files /dev/null and b/pandora_console/images/widgets/service_level.png differ
diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php
index fd00f2eaee..6ed1d582cb 100644
--- a/pandora_console/include/ajax/alert_list.ajax.php
+++ b/pandora_console/include/ajax/alert_list.ajax.php
@@ -652,30 +652,30 @@ if ($get_agent_alerts_datatable === true) {
         if (is_metaconsole() === true) {
             include_once $config['homedir'].'/enterprise/meta/include/functions_alerts_meta.php';
             if ($idAgent !== 0) {
-                $alerts['alerts_simple'] = alerts_meta_get_alerts($agents, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter, $action_filter);
+                $alerts['alerts_simple'] = alerts_meta_get_alerts($agents, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, false, false, $tag_filter, $action_filter);
 
-                $countAlertsSimple = alerts_meta_get_alerts($agents, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter, $action_filter);
+                $countAlertsSimple = alerts_meta_get_alerts($agents, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, false, $tag_filter, $action_filter);
             } else {
                 $id_groups = array_keys(
                     users_get_groups($config['id_user'], 'AR', false)
                 );
-                $alerts['alerts_simple'] = alerts_meta_get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter, $action_filter, $search_sg);
+                $alerts['alerts_simple'] = alerts_meta_get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, false, false, $tag_filter, $action_filter, $search_sg);
 
-                $countAlertsSimple = alerts_meta_get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter, $action_filter, $search_sg);
+                $countAlertsSimple = alerts_meta_get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, false, $tag_filter, $action_filter, $search_sg);
             }
         } else {
             if ($idAgent !== 0) {
-                $alerts['alerts_simple'] = agents_get_alerts_simple($idAgent, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter);
+                $alerts['alerts_simple'] = agents_get_alerts_simple($idAgent, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, false, $tag_filter);
 
-                $countAlertsSimple = agents_get_alerts_simple($idAgent, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter);
+                $countAlertsSimple = agents_get_alerts_simple($idAgent, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, false, $tag_filter);
             } else {
                 $id_groups = array_keys(
                     users_get_groups($config['id_user'], $access, false)
                 );
 
-                $alerts['alerts_simple'] = get_group_alerts($id_groups, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter, $action_filter, false, $search_sg);
+                $alerts['alerts_simple'] = get_group_alerts($id_groups, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, false, $tag_filter, $action_filter, false, $search_sg);
 
-                $countAlertsSimple = get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter, $action_filter, false, $search_sg);
+                $countAlertsSimple = get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, false, $tag_filter, $action_filter, false, $search_sg);
             }
         }
 
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index e4eba79858..67e9ad648f 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -756,6 +756,7 @@ if (check_login()) {
         $access = ($agent_a === true) ? 'AR' : (($agent_w === true) ? 'AW' : 'AR');
         $id_agent = (int) get_parameter('id_agente');
         $id_agente = $id_agent;
+        $id_grupo = agents_get_agent_group($id_agent);
         $show_notinit = (bool) get_parameter('show_notinit');
         $cluster_list = (int) get_parameter('cluster_list');
         $sortField = (string) get_parameter('sort_field');
diff --git a/pandora_console/include/class/ConfigPEN.class.php b/pandora_console/include/class/ConfigPEN.class.php
index cea6123f08..6e2f7ec1f6 100644
--- a/pandora_console/include/class/ConfigPEN.class.php
+++ b/pandora_console/include/class/ConfigPEN.class.php
@@ -118,7 +118,7 @@ class ConfigPEN extends HTML
         if (is_array($filter)) {
             if (!empty($filter['free_search'])) {
                 $sql_filters[] = vsprintf(
-                    ' AND (lower(`manufacturer`) like lower("%%%s%%")
+                    ' AND (lower(REPLACE(manufacturer, " ", " ")) like lower("%%%s%%")
                         OR pen = "%s") ',
                     array_fill(0, 2, $filter['free_search'])
                 );
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index ea3caaf276..9d4a3b2901 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -701,6 +701,10 @@ class Diagnostics extends Wizard
     {
         global $config;
 
+        // Get version comment DB.
+        $sql_version_comment = 'select @@version_comment as version_comment';
+        $version_comment = db_get_sql($sql_version_comment);
+
         $result = [
             'error' => false,
             'data'  => [
@@ -716,6 +720,14 @@ class Diagnostics extends Wizard
                     'name'  => __('DB Schema Build'),
                     'value' => $config['db_scheme_build'],
                 ],
+                'dbVersion'            => [
+                    'name'  => __('Engine version'),
+                    'value' => $config['dbconnection']->server_info,
+                ],
+                'dbVersionComment'     => [
+                    'name'  => __('Version comment'),
+                    'value' => $version_comment,
+                ],
             ],
         ];
 
diff --git a/pandora_console/include/class/TreeService.class.php b/pandora_console/include/class/TreeService.class.php
index b30877a5b5..177a45a54f 100644
--- a/pandora_console/include/class/TreeService.class.php
+++ b/pandora_console/include/class/TreeService.class.php
@@ -333,6 +333,7 @@ class TreeService extends Tree
             $services[$service['id']]['id'] = $service['id'];
             $services[$service['id']]['description'] = $service['description'];
             $services[$service['id']]['serviceDetail'] = 'index.php?sec=network&sec2=enterprise/operation/services/services&tab=service_map&id_service='.(int) $service['id'];
+            $services[$service['id']]['title'] = services_get_parents_title((int) $service['id']);
         }
 
         return $services;
@@ -627,6 +628,7 @@ class TreeService extends Tree
                     $tmp['type'] = 'services';
                     $tmp['rootType'] = 'services';
                     $tmp['children'] = [];
+                    $tmp['servicesChildren'] = services_get_services_children($item->service()->id());
                     $tmp['serviceDetail'] = ui_get_full_url(
                         'index.php?sec=network&sec2=enterprise/operation/services/services&tab=service_map&id_service='.$item->service()->id()
                     );
@@ -731,7 +733,10 @@ class TreeService extends Tree
         if (isset($this->filter['searchService']) === true
             && empty($this->filter['searchService']) === false
         ) {
-            return " AND (ts.name LIKE '%".$this->filter['searchService']."%' OR ts.description LIKE '%".$this->filter['searchService']."%')";
+            $whereAncestors = ' AND ts.name LIKE "%'.$this->filter['searchService'].'%"
+            OR ts.description LIKE "%'.$this->filter['searchService'].'%"';
+
+            return $whereAncestors;
         }
 
         return '';
diff --git a/pandora_console/include/class/WelcomeWindow.class.php b/pandora_console/include/class/WelcomeWindow.class.php
index dec741c3f0..2e2e143a62 100644
--- a/pandora_console/include/class/WelcomeWindow.class.php
+++ b/pandora_console/include/class/WelcomeWindow.class.php
@@ -606,7 +606,7 @@ class WelcomeWindow extends Wizard
                 ],
                 [
                     'arguments' => [
-                        'label'      => __("Let's do it!"),
+                        'label'      => __('Let's do it!'),
                         'type'       => 'button',
                         'attributes' => [
                             'class' => 'secondary',
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fe3237294c..a06a174ade 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 = 'PC231205';
+$build_version = 'PC231213';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 641a9f93f7..0bb6612376 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -306,32 +306,48 @@ function format_for_graph(
 }
 
 
-function human_milliseconds_to_string($seconds)
+function human_milliseconds_to_string($seconds, $size_text='large')
 {
     $ret = '';
 
     // get the days
     $days = intval(intval($seconds) / (360000 * 24));
     if ($days > 0) {
-        $ret .= "$days days ";
+        if ($size_text === 'short') {
+            $ret .= str_replace(' ', '', "$days d").' ';
+        } else {
+            $ret .= "$days days ";
+        }
     }
 
     // get the hours
     $hours = ((intval($seconds) / 360000) % 24);
     if ($hours > 0) {
-        $ret .= "$hours hours ";
+        if ($size_text === 'short') {
+            $ret .= str_replace(' ', '', "$hours h").' ';
+        } else {
+            $ret .= "$hours hours ";
+        }
     }
 
     // get the minutes
     $minutes = ((intval($seconds) / 6000) % 60);
     if ($minutes > 0) {
-        $ret .= "$minutes minutes ";
+        if ($size_text === 'short') {
+            $ret .= str_replace(' ', '', "$minutes m").' ';
+        } else {
+            $ret .= "$minutes minutes ";
+        }
     }
 
     // get the seconds
     $seconds = ((intval($seconds) / 100) % 60);
     if ($seconds > 0) {
-        $ret .= "$seconds seconds";
+        if ($size_text === 'short') {
+            $ret .= str_replace(' ', '', "$seconds s").' ';
+        } else {
+            $ret .= "$seconds seconds ";
+        }
     }
 
     return $ret;
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 8f5fb66f54..bf1c1b3004 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -10301,8 +10301,7 @@ function api_set_module_data($id, $thrash2, $other, $trash1)
                 modules_get_type_name($agentModule['id_tipo_modulo']),
                 $data
             );
-
-            if (false === @file_put_contents($config['remote_config'].'/'.io_safe_output($agent['nombre']).'.'.$time.'.data', $xml)) {
+            if (false === @file_put_contents($config['remote_config'].'/'.io_safe_output($agent['nombre']).'.'.$idAgentModule.'.'.$time.'.data', $xml)) {
                 returnError(sprintf('XML file could not be generated in path: %s', $config['remote_config']));
             } else {
                 echo __('XML file was generated successfully in path: ').$config['remote_config'];
diff --git a/pandora_console/include/functions_cron_task.php b/pandora_console/include/functions_cron_task.php
index 9de0520ccd..40a6e159cc 100644
--- a/pandora_console/include/functions_cron_task.php
+++ b/pandora_console/include/functions_cron_task.php
@@ -459,17 +459,17 @@ function cron_task_start_gotty(bool $restart_mode=true)
 
     // Check prev process running and kill it (only if port changed in setup params).
     if (empty($config['restart_gotty_next_cron_port']) === false) {
-        config_update_value('restart_gotty_next_cron_port', '');
-
-        $prevProcessRunning = shell_exec("pgrep -f 'pandora_gotty.*-p ".$config['restart_gotty_next_cron_port']."'");
+        $prevProcessRunning = shell_exec("pgrep -af 'pandora_gotty.*-p ".$config['restart_gotty_next_cron_port']."' | grep -v 'pgrep'");
 
         if (empty($prevProcessRunning) === false) {
             shell_exec("pkill -f 'pandora_gotty.*-p ".$config['restart_gotty_next_cron_port']."'");
         }
+
+        config_update_value('restart_gotty_next_cron_port', '');
     }
 
     // Check if gotty is running on the configured port.
-    $processRunning = shell_exec("pgrep -f 'pandora_gotty.*-p ".$config['gotty_port']."'");
+    $processRunning = shell_exec("pgrep -af 'pandora_gotty.*-p ".$config['gotty_port']."' | grep -v 'pgrep'");
 
     $start_proc = true;
 
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index 500b668a24..f76dc7c0f7 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -194,11 +194,11 @@ function custom_graphs_get_user($id_user=0, $only_names=false, $returnAllGroup=t
 function custom_graphs_search($id_group, $search)
 {
     if ($id_group != '' && $search != '') {
-        $all_graphs = db_get_all_rows_sql('select * from tgraph where id_group = '.$id_group.' AND (name LIKE "%'.$search.'%" OR description LIKE "'.$search.'")');
+        $all_graphs = db_get_all_rows_sql('select * from tgraph where id_group = '.$id_group.' AND (REPLACE(name, " ", " ")  LIKE "%'.$search.'%" OR REPLACE(description, " ", " ")  LIKE "'.$search.'")');
     } else if ($id_group != '') {
         $all_graphs = db_get_all_rows_sql('select * from tgraph where id_group = '.$id_group.'');
     } else {
-        $all_graphs = db_get_all_rows_sql('select * from tgraph where name LIKE "%'.$search.'%" OR description LIKE "'.$search.'"');
+        $all_graphs = db_get_all_rows_sql('select * from tgraph where REPLACE(name, " ", " ") LIKE "%'.$search.'%" OR REPLACE(description, " ", " ") LIKE "'.$search.'"');
     }
 
     if ($all_graphs === false) {
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index aee3d88730..a390ee2c1a 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -128,19 +128,18 @@ function upload_file($upload_file_or_zip, $default_real_directory, $destination_
             $extension = pathinfo($filename, PATHINFO_EXTENSION);
 
             $umask          = io_safe_output((string) get_parameter('umask'));
-            $parse_all_queries = explode('&', parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY));
-            $parse_sec2_query = explode('=', $parse_all_queries[1]);
-            $check_extension = true;
-            if ($parse_sec2_query[1] === 'operation/snmpconsole/snmp_mib_uploader') {
-                if ((strtolower($extension) !== 'mib' && strtolower($extension) !== 'zip')) {
-                    $check_extension = false;
-                } else {
-                    $check_extension = true;
-                }
-            }
-
+            // $parse_all_queries = explode('&', parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY));
+            // $parse_sec2_query = explode('=', $parse_all_queries[1]);
+            // $check_extension = true;
+            // if ($parse_sec2_query[1] === 'operation/snmpconsole/snmp_mib_uploader') {
+            // if ((strtolower($extension) !== 'mib' && strtolower($extension) !== 'zip')) {
+            // $check_extension = false;
+            // } else {
+            // $check_extension = true;
+            // }
+            // }
             // (strtolower($extension) !== 'mib' && strtolower($extension) !== 'zip')
-            if (strpos($real_directory, $default_real_directory) !== 0 || $check_extension === false) {
+            if (strpos($real_directory, $default_real_directory) !== 0) {
                 // Perform security check to determine whether received upload
                 // directory is part of the default path for caller uploader and
                 // user is not trying to access an external path (avoid
@@ -152,12 +151,12 @@ function upload_file($upload_file_or_zip, $default_real_directory, $destination_
                 // Copy file to directory and change name.
                 $nombre_archivo = sprintf('%s/%s', $real_directory, $filename);
                 try {
-                    $mimeContentType = mime_content_type($_FILES['file']['tmp_name']);
-
-                    if (empty($filterFilesType) === true || in_array($mimeContentType, $filterFilesType) === true) {
+                    $ext = strtolower(pathinfo($_FILES['file']['name'], PATHINFO_EXTENSION));
+                    if (empty($filterFilesType) === true || in_array($ext, $filterFilesType) === true) {
                         $result = copy($_FILES['file']['tmp_name'], $nombre_archivo);
                     } else {
-                        $error_message = 'The uploaded file is not allowed. Only gif, png or jpg files can be uploaded.';
+                        $types_allowed = implode(', ', $filterFilesType);
+                        $error_message = 'The uploaded file is not allowed. Only '.$types_allowed.' files can be uploaded.';
                         throw new Exception(__($error_message));
                     }
                 } catch (Exception $ex) {
@@ -199,19 +198,29 @@ function upload_file($upload_file_or_zip, $default_real_directory, $destination_
             $filepath = $_FILES['file']['tmp_name'];
             $real_directory = filemanager_safe_directory($destination_directory);
             $secure = true;
-            if ($parse_sec2_query[1] === 'operation/snmpconsole/snmp_mib_uploader') {
-                // Security control structure.
-                $zip = new \ZipArchive;
-                if ($zip->open($filepath) === true) {
-                    for ($i = 0; $i < $zip->numFiles; $i++) {
-                        $unzip_filename = $zip->getNameIndex($i);
-                        $extension = pathinfo($unzip_filename, PATHINFO_EXTENSION);
-                        if (strtolower($extension) !== 'mib') {
-                            $secure = false;
-                            break;
+            try {
+                $ext = strtolower(pathinfo($_FILES['file']['name'], PATHINFO_EXTENSION));
+                if (empty($filterFilesType) === true || in_array($ext, $filterFilesType) === true) {
+                    // Security control structure.
+                    $zip = new \ZipArchive;
+                    if ($zip->open($filepath) === true) {
+                        for ($i = 0; $i < $zip->numFiles; $i++) {
+                            $unzip_filename = $zip->getNameIndex($i);
+                            $extension = pathinfo($unzip_filename, PATHINFO_EXTENSION);
+                            if (in_array(strtolower($extension), $filterFilesType) === false) {
+                                $error_message = 'The uploaded file is not allowed. Only '.$types_allowed.' files can be uploaded.';
+                                $secure = false;
+                                throw new Exception(__($error_message));
+                            }
                         }
                     }
                 }
+            } catch (Exception $ex) {
+                db_pandora_audit(
+                    AUDIT_LOG_FILE_MANAGER,
+                    'Error Uploading files: '.$ex->getMessage()
+                );
+                $config['filemanager']['message'] = ui_print_error_message(__('Upload error').': '.$ex->getMessage());
             }
 
             if (strpos($real_directory, $default_real_directory) !== 0 || $secure === false) {
diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php
index ba9116759b..b57ec9e9ff 100644
--- a/pandora_console/include/functions_gis.php
+++ b/pandora_console/include/functions_gis.php
@@ -1585,7 +1585,7 @@ function gis_add_conection_maps_in_form($map_connection_list)
                 

                     '.html_print_input_text('map_connection_name_'.$mapConnection['id_conection'], $mapConnectionRowDB['conection_name'], '', 20, 40, true, true).'
                     '.$radioButton.''.html_print_image('images/delete.svg', true, ['alt' => '', 'class' => 'invert_filter']).''.html_print_image('images/delete.svg', true, ['alt' => '', 'class' => 'invert_filter main_menu_icon']).'