diff --git a/extras/deploy-scripts/deploy_ext_database_el8.sh b/extras/deploy-scripts/deploy_ext_database_el8.sh
index 3ff86cc56b..4417265599 100644
--- a/extras/deploy-scripts/deploy_ext_database_el8.sh
+++ b/extras/deploy-scripts/deploy_ext_database_el8.sh
@@ -19,10 +19,10 @@ LOGFILE="/tmp/deploy-ext-db-$(date +%F).log"
 [ "$DBHOST" ]   || DBHOST=127.0.0.1
 [ "$DBNAME" ]   || DBNAME=pandora
 [ "$DBUSER" ]   || DBUSER=pandora
-[ "$DBPASS" ]   || DBPASS=pandora
+[ "$DBPASS" ]   || DBPASS='Pandor4!'
 [ "$DBPORT" ]   || DBPORT=3306
 [ "$DBROOTUSER" ] || DBROOTUSER=root
-[ "$DBROOTPASS" ] || DBROOTPASS=pandora
+[ "$DBROOTPASS" ] || DBROOTPASS='Pandor4!'
 [ "$SKIP_DATABASE_INSTALL" ]     || SKIP_DATABASE_INSTALL=0
 [ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0
 [ "$POOL_SIZE" ]    || POOL_SIZE=$(grep -i total /proc/meminfo | head -1 | awk '{printf "%.2f \n", $(NF-1)*0.4/1024}' | sed "s/\\..*$/M/g")
@@ -79,6 +79,53 @@ check_root_permissions () {
     fi
 }
 
+# Function to check if a password meets the MySQL secure password requirements
+is_mysql_secure_password() {
+    local password=$1
+
+    # Check password length (at least 8 characters)
+    if [[ ${#password} -lt 8 ]]; then
+        echo "Password length should be at least 8 characters."
+        return 1
+    fi
+
+    # Check if password contains at least one uppercase letter
+    if [[ $password == ${password,,} ]]; then
+        echo "Password should contain at least one uppercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one lowercase letter
+    if [[ $password == ${password^^} ]]; then
+        echo "Password should contain at least one lowercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one digit
+    if ! [[ $password =~ [0-9] ]]; then
+        echo "Password should contain at least one digit."
+        return 1
+    fi
+
+    # Check if password contains at least one special character
+    if ! [[ $password =~ [[:punct:]] ]]; then
+        echo "Password should contain at least one special character."
+        return 1
+    fi
+
+    # Check if password is not a common pattern (e.g., "password", "123456")
+    local common_patterns=("password" "123456" "qwerty")
+    for pattern in "${common_patterns[@]}"; do
+        if [[ $password == *"$pattern"* ]]; then
+            echo "Password should not contain common patterns."
+            return 1
+        fi
+    done
+
+    # If all checks pass, the password is MySQL secure compliant
+    return 0
+}
+
 ## Main
 echo "Starting PandoraFMS External DB deployment EL8 ver. $S_VERSION"
 
@@ -128,6 +175,10 @@ execute_cmd "grep --version" 'Checking needed tools: grep'
 execute_cmd "sed --version" 'Checking needed tools: sed'
 execute_cmd "dnf --version" 'Checking needed tools: dnf'
 
+#Check mysql pass
+execute_cmd "is_mysql_secure_password $DBROOTPASS" "Checking DBROOTPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+execute_cmd "is_mysql_secure_password $DBPASS" "Checking DBPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+
 # Creating working directory
 rm -rf "$HOME"/pandora_deploy_tmp/*.rpm* &>> "$LOGFILE"
 mkdir "$HOME"/pandora_deploy_tmp &>> "$LOGFILE"
@@ -207,16 +258,12 @@ if [ "$SKIP_DATABASE_INSTALL" -eq '0' ] ; then
     export MYSQL_PWD=$(grep "temporary password" /var/log/mysqld.log | rev | cut -d' ' -f1 | rev)
     if [ "$MYVER" -eq '80' ] ; then
         echo """
-        SET PASSWORD FOR '$DBROOTUSER'@'localhost' = 'Pandor4!';
-        UNINSTALL COMPONENT 'file://component_validate_password';
         SET PASSWORD FOR '$DBROOTUSER'@'localhost' = '$DBROOTPASS';
         """ | mysql --connect-expired-password -u$DBROOTUSER &>> "$LOGFILE"
     fi
 
     if [ "$MYVER" -ne '80' ] ; then
         echo """
-        SET PASSWORD FOR '$DBROOTUSER'@'localhost' = PASSWORD('Pandor4!');
-        UNINSTALL PLUGIN validate_password;
         SET PASSWORD FOR '$DBROOTUSER'@'localhost' = PASSWORD('$DBROOTPASS');
         """ | mysql --connect-expired-password -u$DBROOTUSER &>> "$LOGFILE"fi
     fi
diff --git a/extras/deploy-scripts/deploy_ext_database_ubuntu_2204.sh b/extras/deploy-scripts/deploy_ext_database_ubuntu_2204.sh
index 21f9b21fa0..767be5632f 100644
--- a/extras/deploy-scripts/deploy_ext_database_ubuntu_2204.sh
+++ b/extras/deploy-scripts/deploy_ext_database_ubuntu_2204.sh
@@ -26,9 +26,9 @@ rm -f $LOGFILE &> /dev/null # remove last log before start
 [ "$DBHOST" ] || DBHOST=127.0.0.1
 [ "$DBNAME" ] || DBNAME=pandora
 [ "$DBUSER" ] || DBUSER=pandora
-[ "$DBPASS" ] || DBPASS=pandora
+[ "$DBPASS" ] || DBPASS='Pandor4!'
 [ "$DBPORT" ] || DBPORT=3306
-[ "$DBROOTPASS" ] || DBROOTPASS=pandora
+[ "$DBROOTPASS" ] || DBROOTPASS='Pandor4!'
 [ "$SKIP_DATABASE_INSTALL" ]     || SKIP_DATABASE_INSTALL=0
 [ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0
 [ "$POOL_SIZE" ] || POOL_SIZE=$(grep -i total /proc/meminfo | head -1 | awk '{printf "%.2f \n", $(NF-1)*0.4/1024}' | sed "s/\\..*$/M/g")
@@ -86,6 +86,53 @@ check_root_permissions () {
     fi
 }
 
+# Function to check if a password meets the MySQL secure password requirements
+is_mysql_secure_password() {
+    local password=$1
+
+    # Check password length (at least 8 characters)
+    if [[ ${#password} -lt 8 ]]; then
+        echo "Password length should be at least 8 characters."
+        return 1
+    fi
+
+    # Check if password contains at least one uppercase letter
+    if [[ $password == ${password,,} ]]; then
+        echo "Password should contain at least one uppercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one lowercase letter
+    if [[ $password == ${password^^} ]]; then
+        echo "Password should contain at least one lowercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one digit
+    if ! [[ $password =~ [0-9] ]]; then
+        echo "Password should contain at least one digit."
+        return 1
+    fi
+
+    # Check if password contains at least one special character
+    if ! [[ $password =~ [[:punct:]] ]]; then
+        echo "Password should contain at least one special character."
+        return 1
+    fi
+
+    # Check if password is not a common pattern (e.g., "password", "123456")
+    local common_patterns=("password" "123456" "qwerty")
+    for pattern in "${common_patterns[@]}"; do
+        if [[ $password == *"$pattern"* ]]; then
+            echo "Password should not contain common patterns."
+            return 1
+        fi
+    done
+
+    # If all checks pass, the password is MySQL secure compliant
+    return 0
+}
+
 ## Main
 echo "Starting PandoraFMS External DB deployment Ubuntu 22.04 ver. $S_VERSION"
 
@@ -137,6 +184,10 @@ execute_cmd "grep --version" 'Checking needed tools: grep'
 execute_cmd "sed --version" 'Checking needed tools: sed'
 execute_cmd "apt --version" 'Checking needed tools: apt'
 
+#Check mysql pass
+execute_cmd "is_mysql_secure_password $DBROOTPASS" "Checking DBROOTPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+execute_cmd "is_mysql_secure_password $DBPASS" "Checking DBPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+
 # Creating working directory
 rm -rf "$WORKDIR" &>> "$LOGFILE"
 mkdir -p "$WORKDIR" &>> "$LOGFILE"
@@ -170,6 +221,7 @@ if [ "$SKIP_DATABASE_INSTALL" -eq '0' ] ; then
     """ | mysql -uroot &>> "$LOGFILE"
 
     export MYSQL_PWD=$DBROOTPASS
+    echo "INSTALL COMPONENT 'file://component_validate_password';" | mysql -uroot -P$DBPORT -h$DBHOST &>> "$LOGFILE"
     echo -en "${cyan}Creating Pandora FMS database...${reset}"
     echo "create database $DBNAME" | mysql -uroot -P$DBPORT -h$DBHOST
     check_cmd_status "Error creating database $DBNAME, is this an empty node? if you have a previus installation please contact with support."
diff --git a/extras/deploy-scripts/pandora_deploy_community_el8.sh b/extras/deploy-scripts/pandora_deploy_community_el8.sh
index 3b4dde6cef..32422ab98b 100644
--- a/extras/deploy-scripts/pandora_deploy_community_el8.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_el8.sh
@@ -24,10 +24,10 @@ LOGFILE="/tmp/pandora-deploy-community-$(date +%F).log"
 [ "$DBHOST" ]   || DBHOST=127.0.0.1
 [ "$DBNAME" ]   || DBNAME=pandora
 [ "$DBUSER" ]   || DBUSER=pandora
-[ "$DBPASS" ]   || DBPASS=pandora
+[ "$DBPASS" ]   || DBPASS='Pandor4!'
 [ "$DBPORT" ]   || DBPORT=3306
 [ "$DBROOTUSER" ] || DBROOTUSER=root
-[ "$DBROOTPASS" ] || DBROOTPASS=pandora
+[ "$DBROOTPASS" ] || DBROOTPASS='Pandor4!'
 [ "$SKIP_PRECHECK" ] || SKIP_PRECHECK=0
 [ "$SKIP_DATABASE_INSTALL" ]     || SKIP_DATABASE_INSTALL=0
 [ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0
@@ -125,6 +125,52 @@ installing_docker () {
     echo "End installig docker" &>> "$LOGFILE"
 }
 
+# Function to check if a password meets the MySQL secure password requirements
+is_mysql_secure_password() {
+    local password=$1
+
+    # Check password length (at least 8 characters)
+    if [[ ${#password} -lt 8 ]]; then
+        echo "Password length should be at least 8 characters."
+        return 1
+    fi
+
+    # Check if password contains at least one uppercase letter
+    if [[ $password == ${password,,} ]]; then
+        echo "Password should contain at least one uppercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one lowercase letter
+    if [[ $password == ${password^^} ]]; then
+        echo "Password should contain at least one lowercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one digit
+    if ! [[ $password =~ [0-9] ]]; then
+        echo "Password should contain at least one digit."
+        return 1
+    fi
+
+    # Check if password contains at least one special character
+    if ! [[ $password =~ [[:punct:]] ]]; then
+        echo "Password should contain at least one special character."
+        return 1
+    fi
+
+    # Check if password is not a common pattern (e.g., "password", "123456")
+    local common_patterns=("password" "123456" "qwerty")
+    for pattern in "${common_patterns[@]}"; do
+        if [[ $password == *"$pattern"* ]]; then
+            echo "Password should not contain common patterns."
+            return 1
+        fi
+    done
+
+    # If all checks pass, the password is MySQL secure compliant
+    return 0
+}
 
 ## Main
 echo "Starting PandoraFMS Community deployment EL8 ver. $S_VERSION"
@@ -189,6 +235,10 @@ execute_cmd "grep --version" 'Checking needed tools: grep'
 execute_cmd "sed --version" 'Checking needed tools: sed'
 execute_cmd "dnf --version" 'Checking needed tools: dnf'
 
+#Check mysql pass
+execute_cmd "is_mysql_secure_password $DBROOTPASS" "Checking DBROOTPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+execute_cmd "is_mysql_secure_password $DBPASS" "Checking DBPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+
 # Creating working directory
 rm -rf "$HOME"/pandora_deploy_tmp/*.rpm* &>> "$LOGFILE"
 mkdir "$HOME"/pandora_deploy_tmp &>> "$LOGFILE"
@@ -437,7 +487,6 @@ if [ "$SKIP_DATABASE_INSTALL" -eq '0' ] ; then
     if [ "$MYVER" -eq '80' ] ; then
         echo """
         SET PASSWORD FOR '$DBROOTUSER'@'localhost' = 'Pandor4!';
-        UNINSTALL COMPONENT 'file://component_validate_password';
         SET PASSWORD FOR '$DBROOTUSER'@'localhost' = '$DBROOTPASS';
         """ | mysql --connect-expired-password -u$DBROOTUSER &>> "$LOGFILE"
     fi
@@ -445,7 +494,6 @@ if [ "$SKIP_DATABASE_INSTALL" -eq '0' ] ; then
     if [ "$MYVER" -ne '80' ] ; then
         echo """
         SET PASSWORD FOR '$DBROOTUSER'@'localhost' = PASSWORD('Pandor4!');
-        UNINSTALL PLUGIN validate_password;
         SET PASSWORD FOR '$DBROOTUSER'@'localhost' = PASSWORD('$DBROOTPASS');
         """ | mysql --connect-expired-password -u$DBROOTUSER &>> "$LOGFILE"fi
     fi
diff --git a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh
index 7e2ff6f532..a215808d17 100644
--- a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh
@@ -27,9 +27,9 @@ rm -f $LOGFILE &> /dev/null # remove last log before start
 [ "$DBHOST" ] || DBHOST=127.0.0.1
 [ "$DBNAME" ] || DBNAME=pandora
 [ "$DBUSER" ] || DBUSER=pandora
-[ "$DBPASS" ] || DBPASS=pandora
+[ "$DBPASS" ] || DBPASS='Pandor4!'
 [ "$DBPORT" ] || DBPORT=3306
-[ "$DBROOTPASS" ] || DBROOTPASS=pandora
+[ "$DBROOTPASS" ] || DBROOTPASS='Pandor4!'
 [ "$SKIP_PRECHECK" ] || SKIP_PRECHECK=0
 [ "$SKIP_DATABASE_INSTALL" ] || SKIP_DATABASE_INSTALL=0
 [ "$SKIP_KERNEL_OPTIMIZATIONS" ] || SKIP_KERNEL_OPTIMIZATIONS=0
@@ -113,6 +113,53 @@ check_root_permissions () {
     fi
 }
 
+# Function to check if a password meets the MySQL secure password requirements
+is_mysql_secure_password() {
+    local password=$1
+
+    # Check password length (at least 8 characters)
+    if [[ ${#password} -lt 8 ]]; then
+        echo "Password length should be at least 8 characters."
+        return 1
+    fi
+
+    # Check if password contains at least one uppercase letter
+    if [[ $password == ${password,,} ]]; then
+        echo "Password should contain at least one uppercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one lowercase letter
+    if [[ $password == ${password^^} ]]; then
+        echo "Password should contain at least one lowercase letter."
+        return 1
+    fi
+
+    # Check if password contains at least one digit
+    if ! [[ $password =~ [0-9] ]]; then
+        echo "Password should contain at least one digit."
+        return 1
+    fi
+
+    # Check if password contains at least one special character
+    if ! [[ $password =~ [[:punct:]] ]]; then
+        echo "Password should contain at least one special character."
+        return 1
+    fi
+
+    # Check if password is not a common pattern (e.g., "password", "123456")
+    local common_patterns=("password" "123456" "qwerty")
+    for pattern in "${common_patterns[@]}"; do
+        if [[ $password == *"$pattern"* ]]; then
+            echo "Password should not contain common patterns."
+            return 1
+        fi
+    done
+
+    # If all checks pass, the password is MySQL secure compliant
+    return 0
+}
+
 installing_docker () {
     #Installing docker for debug
     echo "Start installig docker" &>> "$LOGFILE"
@@ -194,6 +241,10 @@ execute_cmd "grep --version" 'Checking needed tools: grep'
 execute_cmd "sed --version" 'Checking needed tools: sed'
 execute_cmd "apt --version" 'Checking needed tools: apt'
 
+#Check mysql pass
+execute_cmd "is_mysql_secure_password $DBROOTPASS" "Checking DBROOTPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+execute_cmd "is_mysql_secure_password $DBPASS" "Checking DBPASS password match policy" 'This password do not match minimum MySQL policy requirements, more info in: https://dev.mysql.com/doc/refman/8.0/en/validate-password.html'
+
 # Creating working directory
 rm -rf "$WORKDIR" &>> "$LOGFILE"
 mkdir -p "$WORKDIR" &>> "$LOGFILE"
@@ -286,6 +337,7 @@ server_dependencies=" \
 	libgeo-ip-perl \
     arping \
     snmp-mibs-downloader \
+    snmptrapd \
     libnsl2 \
 	openjdk-8-jdk "
 execute_cmd "apt install -y $server_dependencies" "Installing Pandora FMS Server dependencies"
@@ -402,6 +454,7 @@ if [ "$SKIP_DATABASE_INSTALL" -eq '0' ] ; then
     """ | mysql -uroot &>> "$LOGFILE"
 
     export MYSQL_PWD=$DBROOTPASS
+    echo "INSTALL COMPONENT 'file://component_validate_password';" | mysql -uroot -P$DBPORT -h$DBHOST &>> "$LOGFILE"
     echo -en "${cyan}Creating Pandora FMS database...${reset}"
     echo "create database $DBNAME" | mysql -uroot -P$DBPORT -h$DBHOST
     check_cmd_status "Error creating database $DBNAME, is this an empty node? if you have a previus installation please contact with support."
@@ -785,6 +838,10 @@ sed --follow-symlinks -i -e "s/^openssl_conf = openssl_init/#openssl_conf = open
 # Enable postfix
 systemctl enable postfix --now &>> "$LOGFILE"
 
+# Disable snmptrapd
+systemctl disable --now snmptrapd &>> "$LOGFILE"
+systemctl disable --now snmptrapd.socket &>> "$LOGFILE"
+
 #SSH banner
 [ "$(curl -s ifconfig.me)" ] && ipplublic=$(curl -s ifconfig.me)
 
diff --git a/pandora_agents/pc/DEBIAN/control b/pandora_agents/pc/DEBIAN/control
index cdbcc99cfe..ac23fd959f 100644
--- a/pandora_agents/pc/DEBIAN/control
+++ b/pandora_agents/pc/DEBIAN/control
@@ -4,7 +4,7 @@ Architecture: all
 Priority: optional
 Section: admin
 Installed-Size: 260
-Maintainer: ÁRTICA ST <info@artica.es>
+Maintainer: Pandora FMS <info@pandorafms.com>
 Homepage: https://pandorafms.org/
 Depends: coreutils, perl, unzip
 Description: Pandora FMS agents are based on native languages in every platform: scripts that can be written in any language. It’s possible to reproduce any agent in any programming language and can be extended without difficulty the existing ones in order to cover aspects not taken into account up to the moment. These scripts are formed by modules that each one gathers a "chunk" of information. Thus, every agent gathers several "chunks" of information; this one is organized in a data set and stored in a single file, called data file.
diff --git a/pandora_agents/shellscript/linux/DEBIAN/control b/pandora_agents/shellscript/linux/DEBIAN/control
index 55a5168f93..2ffdee57df 100755
--- a/pandora_agents/shellscript/linux/DEBIAN/control
+++ b/pandora_agents/shellscript/linux/DEBIAN/control
@@ -4,7 +4,7 @@ Architecture: all
 Priority: optional
 Section: admin
 Installed-Size: 260
-Maintainer: ÁRTICA ST <info@artica.es>
+Maintainer: Pandora FMS <info@pandorafms.com>
 Homepage: http://pandorafms.org/
 Depends: coreutils, perl
 Description: Pandora FMS agents are based on native languages in every platform: scripts that can be written in any language. It’s possible to reproduce any agent in any programming language and can be extended without difficulty the existing ones in order to cover aspects not taken into account up to the moment. These scripts are formed by modules that each one gathers a "chunk" of information. Thus, every agent gathers several "chunks" of information; this one is organized in a data set and stored in a single file, called data file.
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index befff3be5c..cf664c3c2e 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,10 +1,10 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.772-230720
+Version: 7.0NG.772-230731
 Architecture: all
 Priority: optional
 Section: admin
 Installed-Size: 260
-Maintainer: ÁRTICA ST <info@artica.es>
+Maintainer: Pandora FMS <info@pandorafms.com>
 Homepage: http://pandorafms.org/
 Depends: coreutils, perl, unzip
 Description: Pandora FMS agents are based on native languages in every platform: scripts that can be written in any language. It’s possible to reproduce any agent in any programming language and can be extended without difficulty the existing ones in order to cover aspects not taken into account up to the moment. These scripts are formed by modules that each one gathers a "chunk" of information. Thus, every agent gathers several "chunks" of information; this one is organized in a data set and stored in a single file, called data file.
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 0f507262b8..fcd0f7713a 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.772-230720"
+pandora_version="7.0NG.772-230731"
 
 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/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist b/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist
index 4ee8965fef..e7c5fa5a91 100644
--- a/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist	
+++ b/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist	
@@ -6,7 +6,7 @@
     <key>CFBundleIdentifier</key> <string>com.pandorafms.pandorafms_uninstall</string>
 
     <key>CFBundleVersion</key>            <string>7.0NG.772</string>
-    <key>CFBundleGetInfoString</key>      <string>7.0NG.772 Pandora FMS Agent uninstaller for MacOS by Artica ST on Aug 2020</string>
+    <key>CFBundleGetInfoString</key>      <string>7.0NG.772 Pandora FMS on Aug 2020</string>
     <key>CFBundleShortVersionString</key> <string>7.0NG.772</string>
 	
     <key>NSPrincipalClass</key><string>NSApplication</string>
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 066c703237..efb5a851ac 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1031,7 +1031,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.772';
-use constant AGENT_BUILD => '230720';
+use constant AGENT_BUILD => '230731';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index b6b857863e..367ce727cd 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.772
-%define release     230720
+%define release     230731
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
new file mode 100644
index 0000000000..226c73426b
--- /dev/null
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -0,0 +1,168 @@
+#
+#Pandora FMS Linux Agent
+#
+%global __os_install_post %{nil}
+%define name        pandorafms_agent_linux_bin
+%define source_name pandorafms_agent_linux
+%define version     7.0NG.772
+%define release     230725
+
+Summary:            Pandora FMS Linux agent, binary version
+Name:               %{name}
+Version:            %{version}
+Release:            %{release}
+License:            GPL
+Vendor:             ArticaST <http://www.artica.es>
+Source0:            %{source_name}-%{version}.tar.gz
+URL:                http://pandorafms.org
+Group:              System/Monitoring
+Packager:           Sancho Lerena <slerena@artica.es>
+Prefix:             /usr/share
+BuildRoot:          %{_tmppath}/%{name}-%{version}-buildroot
+BuildArch:          noarch
+Requires(pre):      shadow-utils
+Requires(post):     chkconfig /bin/ln
+Requires(preun):    chkconfig /bin/rm /usr/sbin/userdel
+Requires:           coreutils unzip
+Requires:           util-linux procps grep
+Requires:           /sbin/ip /bin/awk
+Requires:           perl(Sys::Syslog) perl(IO::Compress::Zip)
+# Required by plugins
+#Requires:           sh-utils sed passwd net-tools rpm
+AutoReq:            0
+Provides:           %{name}-%{version}
+
+%description
+Pandora FMS agent for unix. Pandora FMS is an OpenSource full-featured monitoring software.
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+
+%setup -q -n unix
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_agent/
+mkdir -p $RPM_BUILD_ROOT/usr/bin/
+mkdir -p $RPM_BUILD_ROOT/usr/sbin/
+mkdir -p $RPM_BUILD_ROOT/etc/pandora/
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
+mkdir -p $RPM_BUILD_ROOT/var/log/pandora/
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/rc.d/init.d/pandora_agent_daemon
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
+
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew
+
+install -m 0644 pandora_agent_logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_agent
+
+if [ -f $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent.spec ] ; then
+	rm $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent.spec
+fi
+
+%clean
+rm -Rf $RPM_BUILD_ROOT
+
+%pre
+getent passwd pandora >/dev/null || \
+	/usr/sbin/useradd -d %{prefix}/pandora -s /bin/false -M -g 0 pandora
+exit 0
+chown pandora:root /var/log/pandora
+
+%post
+if [ ! -d /etc/pandora ] ; then
+	mkdir -p /etc/pandora
+fi
+
+if [ ! -f /usr/share/pandora_agent/pandora_agent.conf ] ; then
+	cp /usr/share/pandora_agent/pandora_agent.conf.rpmnew /usr/share/pandora_agent/pandora_agent.conf
+fi
+
+if [ ! -f /etc/pandora/pandora_agent.conf ] ; then
+	ln -s /usr/share/pandora_agent/pandora_agent.conf /etc/pandora/pandora_agent.conf
+else
+	[[ ! -f /etc/pandora/pandora_agent.conf.rpmnew ]] && ln -s /usr/share/pandora_agent/pandora_agent.conf.rpmnew /etc/pandora/pandora_agent.conf.rpmnew
+fi
+
+if [ ! -e /etc/pandora/plugins ]; then
+	ln -s /usr/share/pandora_agent/plugins /etc/pandora
+fi
+
+if [ ! -e /etc/pandora/collections ]; then
+	mkdir -p /usr/share/pandora_agent/collections
+	ln -s /usr/share/pandora_agent/collections /etc/pandora
+fi
+
+if [ ! -e /etc/pandora/commands ]; then
+	mkdir -p /usr/share/pandora_agent/commands
+	ln -s /usr/share/pandora_agent/commands /etc/pandora
+fi
+
+mkdir -p /var/spool/pandora/data_out
+if [ ! -d /var/log/pandora ]; then
+	mkdir -p /var/log/pandora
+fi
+
+if [ `command -v systemctl` ];
+then
+    echo "Copying new version of pandora_agent_daemon service"
+    cp -f /usr/share/pandora_agent/pandora_agent_daemon.service /usr/lib/systemd/system/
+	chmod -x /usr/lib/systemd/system/pandora_agent_daemon.service
+# Enable the services on SystemD
+    systemctl enable pandora_agent_daemon.service
+else
+	/sbin/chkconfig --add pandora_agent_daemon
+	/sbin/chkconfig pandora_agent_daemon on
+fi
+
+if [ "$1" -gt 1 ]
+then
+
+      echo "If Pandora Agent daemon was running with init.d script,"
+      echo "please stop it manually and start the service with systemctl"
+
+fi
+
+
+%preun
+
+# Upgrading
+if [ "$1" = "1" ]; then
+	exit 0
+fi
+
+/sbin/chkconfig --del pandora_agent_daemon 
+/etc/rc.d/init.d/pandora_agent_daemon stop >/dev/null 2>&1 || :
+
+# Remove symbolic links
+pushd /etc/pandora
+for f in pandora_agent.conf plugins collections
+do
+	[ -L $f ] && rm -f $f
+done
+exit 0
+
+%files
+%defattr(750,root,root)
+/usr/bin/pandora_agent
+
+%defattr(755,pandora,root)
+%{prefix}/pandora_agent
+
+%defattr(755,root,root)
+/usr/bin/pandora_agent_exec
+/usr/bin/tentacle_client
+/etc/rc.d/init.d/pandora_agent_daemon
+
+%defattr(644,root,root)
+/usr/share/man/man1/pandora_agent.1.gz
+/usr/share/man/man1/tentacle_client.1.gz
+%config(noreplace) %{_sysconfdir}/logrotate.d/pandora_agent
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 7df3b5fca9..82db72ff9a 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.772
-%define release     230720
+%define release     230731
 
 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 7ad2b9f219..9b5c149c66 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.772"
-PI_BUILD="230720"
+PI_BUILD="230731"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 656dff5ec3..df59837034 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230720}
+{230731}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8cb58c7095..209bcae1d4 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.772 Build 230720")
+#define PANDORA_VERSION ("7.0NG.772 Build 230731")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 009659b454..1d5a5afd7c 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -6,12 +6,12 @@ BEGIN
   BEGIN
     BLOCK "080904E4"
     BEGIN
-      VALUE "CompanyName", "Artica ST"
+      VALUE "CompanyName", "Pandora FMS"
       VALUE "FileDescription", "Pandora FMS Agent for Windows Platform"
-      VALUE "LegalCopyright", "Artica ST"
+      VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.772(Build 230720))"
+      VALUE "ProductVersion", "(7.0NG.772(Build 230731))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 66c16b35b1..2edba2be84 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,10 +1,10 @@
 package: pandorafms-console
-Version: 7.0NG.772-230720
+Version: 7.0NG.772-230731
 Architecture: all
 Priority: optional
 Section: admin
 Installed-Size: 42112
-Maintainer: Artica ST <deptec@artica.es>
+Maintainer: Pandora FMS <info@pandorafms.com>
 Homepage: https://pandorafms.com/
 Depends: php, php-snmp, php-gd, php-mysqlnd, php-db, php-xmlrpc, php-curl, graphviz, dbconfig-common, php-ldap, mysql-client | virtual-mysql-client, php-xmlrpc, php-zip, php-mbstring
 Description: Pandora FMS is an Open Source monitoring tool. It monitor your systems and applications, and allows you to control the status of any element of them. The web console is the graphical user interface (GUI) to manage the pool and to generate reports and graphs from the Pandora FMS monitoring process.
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index a2c66fff09..88f61b7499 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.772-230720"
+pandora_version="7.0NG.772-230731"
 
 package_pear=0
 package_pandora=1
@@ -163,7 +163,7 @@ if [ $package_pear -eq 1 ]
 then
 	echo "Make the package \"php-xml-rpc\"."
 	cd temp_package
-	dh-make-pear --maintainer "ÁRTICA ST <info@artica.es>" XML_RPC
+	dh-make-pear --maintainer "Pandora FMS <info@pandorafms.com>" XML_RPC
 	cd php-xml-rpc-*
 	dpkg-buildpackage -rfakeroot
 	cd ..
diff --git a/pandora_console/composer.lock b/pandora_console/composer.lock
index d7a05579a9..cf6f9f2502 100644
--- a/pandora_console/composer.lock
+++ b/pandora_console/composer.lock
@@ -609,7 +609,7 @@
                 }
             ],
             "description": "PHP library for ChartJS",
-            "homepage": "https://artica.es/",
+            "homepage": "https://pandorafms.com/",
             "keywords": [
                 "chartjs",
                 "graph",
diff --git a/pandora_console/extras/mr/65.sql b/pandora_console/extras/mr/65.sql
index 623c0a36f0..31e221f3b0 100644
--- a/pandora_console/extras/mr/65.sql
+++ b/pandora_console/extras/mr/65.sql
@@ -1,5 +1,49 @@
 START TRANSACTION;
 
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps` (
+  `id_app` int(10) auto_increment,
+  `short_name` varchar(250) NOT NULL DEFAULT '',
+  `name` varchar(250) NOT NULL DEFAULT '',
+  `section` varchar(250) NOT NULL DEFAULT 'custom',
+  `description` varchar(250) NOT NULL DEFAULT '',
+  `version` varchar(250) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id_app`),
+  UNIQUE (`short_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps_scripts` (
+  `id_app` int(10),
+  `macro` varchar(250) NOT NULL DEFAULT '',
+  `value` text NOT NULL DEFAULT '',
+  PRIMARY KEY (`id_app`, `macro`),
+  FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps_executions` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `id_app` int(10),
+  `execution` text NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`, `id_app`),
+  FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps_tasks_macros` (
+  `id_task` int(10) unsigned NOT NULL,
+  `macro` varchar(250) NOT NULL DEFAULT '',
+  `type` varchar(250) NOT NULL DEFAULT 'custom',
+  `value` text NOT NULL DEFAULT '',
+  `temp_conf` tinyint unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id_task`, `macro`),
+  FOREIGN KEY (`id_task`) REFERENCES trecon_task(`id_rt`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+
+ALTER TABLE `trecon_task`
+  ADD COLUMN `id_app` int(10),
+  ADD COLUMN `setup_complete` tinyint unsigned NOT NULL DEFAULT 0,
+  ADD COLUMN `executions_timeout` int unsigned NOT NULL DEFAULT 60,
+  ADD FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE;
+
 CREATE TABLE IF NOT EXISTS `tnetwork_explorer_filter` (
 `id` INT NOT NULL,
 `filter_name` VARCHAR(45) NULL,
@@ -26,6 +70,7 @@ ALTER TABLE `tlayout_template`
 ADD COLUMN `grid_color` VARCHAR(45) NOT NULL DEFAULT '#cccccc' AFTER `maintenance_mode`,
 ADD COLUMN `grid_size` VARCHAR(45) NOT NULL DEFAULT '10' AFTER `grid_color`;
 
+
 DELETE FROM tconfig WHERE token = 'refr';
 
 INSERT INTO `tmodule_inventory` (`id_module_inventory`, `id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`) VALUES (37,2,'CPU','CPU','','Brand;Clock;Model','',0,2);
@@ -38,4 +83,32 @@ INSERT INTO `tmodule_inventory` (`id_module_inventory`, `id_os`, `name`, `descri
 
 ALTER TABLE `treport_content`  ADD COLUMN `period_range` INT NULL DEFAULT 0 AFTER `period`;
 
+CREATE TABLE IF NOT EXISTS `tevent_comment` (
+  `id` serial PRIMARY KEY,
+  `id_event` BIGINT UNSIGNED NOT NULL,
+  `utimestamp` BIGINT NOT NULL DEFAULT 0,
+  `comment` TEXT,
+  `id_user` VARCHAR(255) DEFAULT NULL,
+  `action` TEXT,
+  FOREIGN KEY (`id_event`) REFERENCES `tevento`(`id_evento`)
+    ON UPDATE CASCADE ON DELETE CASCADE,
+  FOREIGN KEY (`id_user`) REFERENCES tusuario(`id_user`)
+    ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+INSERT INTO `tevent_comment` (`id_event`, `utimestamp`, `comment`, `id_user`, `action`)
+SELECT * FROM (
+  SELECT tevento.id_evento AS `id_event`,
+  JSON_UNQUOTE(JSON_EXTRACT(tevento.user_comment, CONCAT('$[',n.num,'].utimestamp'))) AS `utimestamp`,
+  JSON_UNQUOTE(JSON_EXTRACT(tevento.user_comment, CONCAT('$[',n.num,'].comment'))) AS `comment`,
+  JSON_UNQUOTE(JSON_EXTRACT(tevento.user_comment, CONCAT('$[',n.num,'].id_user'))) AS  `id_user`,
+  JSON_UNQUOTE(JSON_EXTRACT(tevento.user_comment, CONCAT('$[',n.num,'].action'))) AS `action`
+  FROM tevento
+  INNER JOIN (SELECT 0 num UNION ALL SELECT 1 UNION ALL SELECT 2) n
+    ON n.num < JSON_LENGTH(tevento.user_comment)
+  WHERE tevento.user_comment != ""
+) t order by utimestamp DESC;
+
+ALTER TABLE tevento DROP COLUMN user_comment;
+
 COMMIT;
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index af9e16d288..36090b9446 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -233,11 +233,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
 
         $header_autorefresh = '';
         $header_autorefresh_counter = '';
-        if ($config['legacy_vc']
-            || ($_GET['sec2'] !== 'operation/visual_console/render_view')
-            || (($_GET['sec2'] !== 'operation/visual_console/render_view')
-            && $config['legacy_vc'])
-        ) {
+
+        if (($_GET['sec2'] !== 'operation/visual_console/render_view')) {
             if ($autorefresh_list !== null
                 && array_search($_GET['sec2'], $autorefresh_list) !== false
             ) {
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index b161b7ff6d..cbe7858e9e 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -212,7 +212,7 @@ $groups = users_get_groups($config['id_user'], 'AR', false);
 // Get modules.
 $modules = db_get_all_rows_sql(
     'SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo
-								WHERE id_agente = '.$id_parent
+								WHERE id_agente = '.$id_agente
 );
 $modules_values = [];
 $modules_values[0] = __('Any');
@@ -300,7 +300,7 @@ if (enterprise_installed() === true) {
 // Parent agents.
 $paramsParentAgent = [];
 $paramsParentAgent['return'] = true;
-$paramsParentAgent['show_helptip'] = false;
+$paramsParentAgent['show_helptip'] = true;
 $paramsParentAgent['input_name'] = 'id_parent';
 $paramsParentAgent['print_hidden_input_idagent'] = true;
 $paramsParentAgent['hidden_input_idagent_name'] = 'id_agent_parent';
@@ -646,7 +646,7 @@ if (enterprise_installed() === true) {
 
 // Parent agent.
 $tableAdvancedAgent->data['parent_agent'][] = html_print_label_input_block(
-    __('Parent'),
+    __('Agent parent'),
     ui_print_agent_autocomplete_input($paramsParentAgent)
 );
 
@@ -1205,15 +1205,30 @@ ui_require_jquery_file('bgiframe');
             $("#cascade_protection_module").attr("disabled", 'disabled');
         }
 
-        $("#checkbox-cascade_protection").change(function () {
-            var checked = $("#checkbox-cascade_protection").is(":checked");
-    
-            if (checked) {
+        $("#text-id_parent").change(function(){
+            const parent = $("#text-id_parent").val();
+            if (parent != '') {
+                $("#checkbox-cascade_protection").prop('checked', true);
                 $("#cascade_protection_module").removeAttr("disabled");
             }
             else {
                 $("#cascade_protection_module").val(0);
                 $("#cascade_protection_module").attr("disabled", 'disabled');
+                $("#text-id_parent").removeAttr("required");
+                $("#cascade_protection_module").empty();
+                $("#checkbox-cascade_protection").prop('checked', false);
+            }
+        });
+
+        $("#checkbox-cascade_protection").change(function () {
+            var checked = $("#checkbox-cascade_protection").is(":checked");            if (checked) {
+                $("#cascade_protection_module").removeAttr("disabled");
+                $("#text-id_parent").attr("required", "required");
+            }
+            else {
+                $("#cascade_protection_module").val(0);
+                $("#cascade_protection_module").attr("disabled", 'disabled');
+                $("#text-id_parent").removeAttr("required");
             }
         });
         
diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php
index a9a65bc834..959db70ed6 100755
--- a/pandora_console/godmode/agentes/planned_downtime.list.php
+++ b/pandora_console/godmode/agentes/planned_downtime.list.php
@@ -89,7 +89,7 @@ if (is_ajax() === true) {
             [
                 'id'                  => 'agent_modules_affected_planned_downtime',
                 'class'               => 'info_table',
-                'style'               => 'width: 99%',
+                'style'               => 'width: 100%',
                 'columns'             => $columns,
                 'column_names'        => $column_names,
                 'ajax_url'            => 'godmode/agentes/planned_downtime.list',
diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php
index 9872a002f5..46095b6efb 100755
--- a/pandora_console/godmode/category/category.php
+++ b/pandora_console/godmode/category/category.php
@@ -184,7 +184,7 @@ if (empty($result) === false) {
                 ]
             ).'</a>&nbsp;&nbsp;';
             $data[1] .= '<a  href="index.php?sec=advanced&sec2=godmode/category/category&delete_category='.$category['id'].'&pure='.(int) $config['pure'].'"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">'.html_print_image(
-                'images/delet.svg',
+                'images/delete.svg',
                 true,
                 [
                     'title' => __('Delete'),
diff --git a/pandora_console/godmode/groups/tactical.php b/pandora_console/godmode/groups/tactical.php
index 067bed45be..0b09cbc789 100644
--- a/pandora_console/godmode/groups/tactical.php
+++ b/pandora_console/godmode/groups/tactical.php
@@ -187,7 +187,7 @@ try {
         [
             'id'                  => 'list_agents_tactical',
             'class'               => 'info_table',
-            'style'               => 'width: 99%',
+            'style'               => 'width: 100%',
             'columns'             => $columns,
             'column_names'        => $columnNames,
             'return'              => true,
diff --git a/pandora_console/godmode/massive/massive_delete_agents.php b/pandora_console/godmode/massive/massive_delete_agents.php
index 5bb84b62be..1dc6397cc6 100755
--- a/pandora_console/godmode/massive/massive_delete_agents.php
+++ b/pandora_console/godmode/massive/massive_delete_agents.php
@@ -189,6 +189,14 @@ echo get_table_inputs_masive_agents($params);
 
 if (is_metaconsole() === true || is_management_allowed() === true) {
     attachActionButton('delete', 'delete', '100%', false, $SelectAction);
+} else {
+    html_print_action_buttons(
+        '',
+        [
+            'right_content' => $SelectAction,
+            'class'         => 'pdd_t_15px_important pdd_b_15px_important',
+        ]
+    );
 }
 
 echo '</form>';
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 3d04b230b0..3f8ade2b1a 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -30,6 +30,7 @@
 // Begin.
 require_once 'include/config.php';
 require_once 'include/functions_menu.php';
+require_once $config['homedir'].'/godmode/wizards/ManageExtensions.class.php';
 
 check_login();
 
@@ -78,15 +79,97 @@ if ((bool) check_acl($config['id_user'], 0, 'AR') === true
         }
 
         if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
-            enterprise_hook('applications_menu');
-            enterprise_hook('cloud_menu');
-        }
+            // Applications.
+            $sub2 = [];
+            if (enterprise_installed() === true) {
+                $sub2['godmode/servers/discovery&wiz=app&mode=MicrosoftSQLServer']['text'] = __('Microsoft SQL Server');
+                $sub2['godmode/servers/discovery&wiz=app&mode=mysql']['text'] = __('Mysql');
+                $sub2['godmode/servers/discovery&wiz=app&mode=oracle']['text'] = __('Oracle');
+                $sub2['godmode/servers/discovery&wiz=app&mode=vmware']['text'] = __('VMware');
+                $sub2['godmode/servers/discovery&wiz=app&mode=SAP']['text'] = __('SAP');
+                $sub2['godmode/servers/discovery&wiz=app&mode=DB2']['text'] = __('DB2');
+            }
 
-        if ((bool) check_acl($config['id_user'], 0, 'RW') === true
-            || (bool) check_acl($config['id_user'], 0, 'RM') === true
-            || (bool) check_acl($config['id_user'], 0, 'PM') === true
-        ) {
-            enterprise_hook('console_task_menu');
+            $extensions = ManageExtensions::getExtensionBySection('app');
+            if ($extensions !== false) {
+                foreach ($extensions as $key => $extension) {
+                    $url = sprintf(
+                        'godmode/servers/discovery&wiz=app&mode=%s',
+                        $extension['short_name']
+                    );
+                    $sub2[$url]['text'] = __($extension['name']);
+                }
+            }
+
+            if ($extensions !== false || enterprise_installed() === true) {
+                $sub['godmode/servers/discovery&wiz=app']['text'] = __('Applications');
+                $sub['godmode/servers/discovery&wiz=app']['id'] = 'app';
+                $sub['godmode/servers/discovery&wiz=app']['type'] = 'direct';
+                $sub['godmode/servers/discovery&wiz=app']['subtype'] = 'nolink';
+                $sub['godmode/servers/discovery&wiz=app']['sub2'] = $sub2;
+            }
+
+            // Cloud.
+            $sub2 = [];
+            if (enterprise_installed() === true) {
+                $sub2['godmode/servers/discovery&wiz=cloud&mode=amazonws']['text'] = __('Amazon Web Services');
+                $sub2['godmode/servers/discovery&wiz=cloud&mode=azure']['text'] = __('Microsoft Azure');
+                $sub2['godmode/servers/discovery&wiz=cloud&mode=gcp']['text'] = __('Google Compute Platform');
+            }
+
+
+            $extensions = ManageExtensions::getExtensionBySection('cloud');
+            if ($extensions !== false) {
+                foreach ($extensions as $key => $extension) {
+                    $url = sprintf(
+                        'godmode/servers/discovery&wiz=cloud&mode=%s',
+                        $extension['short_name']
+                    );
+                    $sub2[$url]['text'] = __($extension['name']);
+                }
+            }
+
+            if ($extensions !== false || enterprise_installed() === true) {
+                $sub['godmode/servers/discovery&wiz=cloud']['text'] = __('Cloud');
+                $sub['godmode/servers/discovery&wiz=cloud']['id'] = 'cloud';
+                $sub['godmode/servers/discovery&wiz=cloud']['type'] = 'direct';
+                $sub['godmode/servers/discovery&wiz=cloud']['subtype'] = 'nolink';
+                $sub['godmode/servers/discovery&wiz=cloud']['sub2'] = $sub2;
+            }
+
+            // Custom.
+            $sub2 = [];
+            $extensions = ManageExtensions::getExtensionBySection('custom');
+            if ($extensions !== false) {
+                foreach ($extensions as $key => $extension) {
+                    $url = sprintf(
+                        'godmode/servers/discovery&wiz=custom&mode=%s',
+                        $extension['short_name']
+                    );
+                    $sub2[$url]['text'] = __($extension['name']);
+                }
+
+                $sub['godmode/servers/discovery&wiz=custom']['text'] = __('Custom');
+                $sub['godmode/servers/discovery&wiz=custom']['id'] = 'customExt';
+                $sub['godmode/servers/discovery&wiz=custom']['type'] = 'direct';
+                $sub['godmode/servers/discovery&wiz=custom']['subtype'] = 'nolink';
+                $sub['godmode/servers/discovery&wiz=custom']['sub2'] = $sub2;
+            }
+
+            if (check_acl($config['id_user'], 0, 'RW')
+                || check_acl($config['id_user'], 0, 'RM')
+                || check_acl($config['id_user'], 0, 'PM')
+            ) {
+                $sub['godmode/servers/discovery&wiz=magextensions']['text'] = __('Manage disco packages');
+                $sub['godmode/servers/discovery&wiz=magextensions']['id'] = 'mextensions';
+            }
+
+            if ((bool) check_acl($config['id_user'], 0, 'RW') === true
+                || (bool) check_acl($config['id_user'], 0, 'RM') === true
+                || (bool) check_acl($config['id_user'], 0, 'PM') === true
+            ) {
+                enterprise_hook('console_task_menu');
+            }
         }
     }
 
@@ -502,9 +585,13 @@ if ($access_console_node === true) {
                 $sub2[$extmenu['sec2']]['refr'] = 0;
             } else {
                 if (is_array($extmenu) === true && array_key_exists('fatherId', $extmenu) === true) {
-                    if (strlen($extmenu['fatherId']) > 0) {
+                    if (empty($extmenu['fatherId']) === false
+                        && strlen($extmenu['fatherId']) > 0
+                    ) {
                         if (array_key_exists('subfatherId', $extmenu) === true) {
-                            if (strlen($extmenu['subfatherId']) > 0) {
+                            if (empty($extmenu['subfatherId']) === false
+                                && strlen($extmenu['subfatherId']) > 0
+                            ) {
                                 $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['text'] = __($extmenu['name']);
                                 $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['id'] = str_replace(' ', '_', $extmenu['name']);
                                 $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['refr'] = 0;
diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index 6e66c886fb..1a5fbb4283 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -488,14 +488,38 @@ if (!empty($graphs)) {
                 true
             );
             $ActionButtons[] = '</form>';
+
+            $offset = (int) get_parameter('offset', 0);
+            $block_size = (int) $config['block_size'];
+
+            $tablePagination = ui_pagination(
+                count($graphs),
+                false,
+                $offset,
+                $block_size,
+                true,
+                'offset',
+                false
+            );
         }
 
         // FALTA METER EL PRINT TABLE.
         html_print_table($table);
-        html_print_action_buttons(
-            implode('', $ActionButtons),
-            ['type' => 'form_action']
-        );
+
+        if (is_metaconsole() === true) {
+            html_print_action_buttons(
+                implode('', $ActionButtons),
+                ['type' => 'form_action']
+            );
+        } else {
+            html_print_action_buttons(
+                implode('', $ActionButtons),
+                [
+                    'type'          => 'form_action',
+                    'right_content' => $tablePagination,
+                ]
+            );
+        }
     }
 
         echo '</div>';
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 4a629c1090..397e533366 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -6720,6 +6720,8 @@ function chooseType() {
             $("#row_agent").show();
             $("#row_module").show();
             $("#row_historical_db_check").hide();
+            period_set_value($("#hidden-period").attr('class'), 3600);
+            $("#row_period").find('select').val('3600').trigger('change');
             break;
 
         case 'SLA_monthly':
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index d00e70474d..00bc80f234 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -116,10 +116,13 @@ if (!$report_r && !$report_w && !$report_m) {
 }
 
 require_once $config['homedir'].'/include/functions_reports.php';
+require_once $config['homedir'].'/godmode/wizards/DiscoveryTaskList.class.php';
 
 // Load enterprise extensions.
 enterprise_include('operation/reporting/custom_reporting.php');
 enterprise_include_once('include/functions_metaconsole.php');
+enterprise_include_once('include/functions_tasklist.php');
+enterprise_include_once('include/functions_cron.php');
 
 
 
@@ -782,7 +785,7 @@ switch ($action) {
             '<span class="subsection_header_title">'.__('Filters').'</span>',
             'filter_form',
             '',
-            false,
+            true,
             false,
             '',
             'white-box-content',
@@ -1251,7 +1254,12 @@ switch ($action) {
                 array_push($table->data, $data);
             }
 
-            html_print_table($table);
+            $reports_table = '<div class="white_box">';
+            $reports_table .= '<span class="white_table_graph_header">'.__('Reports').'</span>';
+            $reports_table .= html_print_table($table, true);
+            $reports_table .= '<br></div>';
+            echo $reports_table;
+
             $tablePagination = ui_pagination(
                 $total_reports,
                 $url,
@@ -1259,7 +1267,7 @@ switch ($action) {
                 $pagination,
                 true,
                 'offset',
-                false,
+                false
             );
         } else {
             ui_print_info_message(
@@ -1270,6 +1278,21 @@ switch ($action) {
             );
         }
 
+        $discovery_tasklist = new DiscoveryTaskList();
+        $report_task_data = $discovery_tasklist->showListConsoleTask(true);
+
+        if (is_array($report_task_data) === true || strpos($report_task_data, 'class="nf"') === false) {
+            $task_table = '<div class="mrgn_top_15px white_box">';
+            $task_table .= '<span class="white_table_graph_header">'.__('Report tasks');
+            $task_table .= ui_print_help_tip(__('To schedule a report, do it from the editing view of each report.'), true);
+            $task_table .= '</span><div>';
+            $task_table .= $report_task_data;
+            $task_table .= '</div></div>';
+            echo $task_table;
+        } else {
+            ui_print_info_message($report_task_data.__('To schedule a report, do it from the editing view of each report.'));
+        }
+
         if (check_acl($config['id_user'], 0, 'RW')
             || check_acl($config['id_user'], 0, 'RM')
         ) {
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 740b97708a..9988704695 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -837,12 +837,6 @@ $buttons['wizard'] = [
     'active' => false,
     'text'   => '<a href="'.$url_base.$action.'&tab=wizard&id_visual_console='.$idVisualConsole.'">'.html_print_image('images/wizard@svg.svg', true, ['title' => __('Wizard'), 'class' => 'invert_filter']).'</a>',
 ];
-if ($config['legacy_vc']) {
-    $buttons['editor'] = [
-        'active' => false,
-        'text'   => '<a href="'.$url_base.$action.'&tab=editor&id_visual_console='.$idVisualConsole.'">'.html_print_image('images/builder@svg.svg', true, ['title' => __('Builder'), 'class' => 'invert_filter']).'</a>',
-    ];
-}
 
 $buttons['view'] = [
     'active' => false,
diff --git a/pandora_console/godmode/servers/discovery.php b/pandora_console/godmode/servers/discovery.php
index 3df3342f52..9af4343a84 100755
--- a/pandora_console/godmode/servers/discovery.php
+++ b/pandora_console/godmode/servers/discovery.php
@@ -53,6 +53,12 @@ function get_wiz_class($str)
         case 'deploymentCenter':
         return 'DeploymentCenter';
 
+        case 'magextensions':
+        return 'ManageExtensions';
+
+        case 'custom':
+        return 'Custom';
+
         default:
             // Main, show header.
             ui_print_standard_header(
@@ -161,7 +167,7 @@ if ($classname_selected === null) {
     $wiz_data = [];
     foreach ($classes as $classpath) {
         if (is_reporting_console_node() === true) {
-            if ($classpath !== '/var/www/html/pandora_console/godmode/wizards/DiscoveryTaskList.class.php') {
+            if ($classpath !== $config['homedir'].'/godmode/wizards/DiscoveryTaskList.class.php') {
                 continue;
             }
         }
@@ -169,6 +175,12 @@ if ($classname_selected === null) {
         $classname = basename($classpath, '.class.php');
         $obj = new $classname();
 
+        if (method_exists($obj, 'isEmpty') === true) {
+            if ($obj->isEmpty() === true) {
+                continue;
+            }
+        }
+
         $button = $obj->load();
 
         if ($button === false) {
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 04b622e312..315702528e 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -560,7 +560,14 @@ if (empty($create) === false || empty($view) === false) {
     // $data[0] = html_print_div(['id' => 'command_preview', 'class' => 'mono'], true);
     $data[0] = html_print_label_input_block(
         __('Command preview'),
-        html_print_div(['id' => 'command_preview', 'class' => 'mono'], true)
+        html_print_div(
+            [
+                'id'    => 'command_preview',
+                'class' => 'mono',
+                'style' => 'max-width: 1050px;overflow-wrap: break-word;',
+            ],
+            true
+        )
     );
     $table->data['plugin_preview_inputs'] = $data;
     $table->colspan['plugin_preview_inputs'][0] = 2;
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 8cb64950d3..35cd540e6a 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -101,6 +101,13 @@ foreach ($servers as $server) {
     }
 }
 
+$ext = '';
+
+// Check for any data-type server present in servers list. If none, enable server access for first server.
+if (array_search('data', array_column($servers, 'type')) === false) {
+    $ext = '_server';
+}
+
 foreach ($servers as $server) {
     $data = [];
 
@@ -185,14 +192,12 @@ foreach ($servers as $server) {
 
     $data[7] = ui_print_timestamp($server['keepalive'], true);
 
-
-    $ext = '_server';
-    if ($server['type'] != 'data') {
-        $ext = '';
+    if ($server['type'] === 'data') {
+        $ext = '_server';
     }
 
     $safe_server_name = servers_get_name($server['id_server']);
-    if (($server['type'] == 'data' || $server['type'] == 'enterprise satellite')) {
+    if (($ext === '_server' || $server['type'] == 'enterprise satellite')) {
         if (servers_check_remote_config($safe_server_name.$ext) && enterprise_installed()) {
             $names_servers[$safe_server_name] = true;
         } else {
@@ -253,9 +258,19 @@ foreach ($servers as $server) {
         );
         $data[8] .= '</a>';
 
-        if (($names_servers[$safe_server_name] === true) && ($server['type'] === 'data' || $server['type'] === 'enterprise satellite')) {
+        if (($names_servers[$safe_server_name] === true) && ($ext === '_server' || $server['type'] === 'enterprise satellite')) {
             $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext.'&tab=agent_editor').'">';
-            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext).'&tab=standard_editor">';
+            $data[8] .= html_print_image(
+                'images/agents@svg.svg',
+                true,
+                [
+                    'title' => __('Manage server conf'),
+                    'class' => 'main_menu_icon invert_filter',
+                ]
+            );
+            $data[8] .= '</a>';
+
+            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext).'">';
             $data[8] .= html_print_image(
                 'images/remote-configuration@svg.svg',
                 true,
@@ -288,6 +303,8 @@ foreach ($servers as $server) {
         unset($data[8]);
     }
 
+    $ext = '';
+
     array_push($table->data, $data);
 }
 
diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php
index 0cd6c53d2d..51cd554a66 100644
--- a/pandora_console/godmode/setup/performance.php
+++ b/pandora_console/godmode/setup/performance.php
@@ -545,23 +545,8 @@ $table->data[6][0] = html_print_label_input_block(
     )
 );
 
-$table->data[6][1] = html_print_label_input_block(
-    __('Max. days before delete old network matrix data'),
-    html_print_input(
-        [
-            'type'   => 'number',
-            'size'   => 5,
-            'max'    => $performance_variables_control['delete_old_network_matrix']->max,
-            'name'   => 'delete_old_network_matrix',
-            'value'  => $config['delete_old_network_matrix'],
-            'return' => true,
-            'min'    => $performance_variables_control['delete_old_network_matrix']->min,
-        ]
-    )
-);
-
 if (enterprise_installed()) {
-    $table->data[7][0] = html_print_label_input_block(
+    $table->data[6][1] = html_print_label_input_block(
         __('Max. days before delete inventory data'),
         html_print_input_text(
             'inventory_purge',
@@ -574,6 +559,18 @@ if (enterprise_installed()) {
     );
 }
 
+$table->data[7][1] = html_print_label_input_block(
+    __('Max. days before disabled agents are deleted'),
+    html_print_input_text(
+        'delete_disabled_agents',
+        $config['delete_disabled_agents'],
+        '',
+        false,
+        0,
+        true
+    )
+);
+
 $table_other = new stdClass();
 $table_other->width = '100%';
 $table_other->class = 'filter-table-adv';
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index 6d7d53a942..aa55893d11 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -747,6 +747,26 @@ $table->data[$i][] = html_print_label_input_block(
     )
 );
 
+$table->data[$i++][] = html_print_label_input_block(
+    __('Max. hours old events comments'),
+    html_print_input_number(
+        [
+            'name'  => 'max_hours_old_event_comment',
+            'min'   => 0,
+            'value' => $config['max_hours_old_event_comment'],
+        ]
+    )
+);
+$table->data[$i][] = html_print_label_input_block(
+    __('Show experimental features'),
+    html_print_checkbox_switch(
+        'show_experimental_features',
+        1,
+        $config['show_experimental_features'],
+        true
+    )
+);
+
 echo '<form class="max_floating_element_size" id="form_setup" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general&amp;pure='.$config['pure'].'">';
 
 echo '<fieldset class="margin-bottom-10">';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 96856a2f32..a7b64a67d7 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1344,17 +1344,6 @@ $table_vc->style[0] = 'font-weight: bold';
 $table_vc->size[0] = '50%';
 $table_vc->data = [];
 
-// Remove when the new view reaches rock solid stability.
-$table_vc->data[$row][] = html_print_label_input_block(
-    __('Legacy Visual Console View'),
-    html_print_checkbox_switch(
-        'legacy_vc',
-        1,
-        (bool) $config['legacy_vc'],
-        true
-    )
-);
-
 $table_vc->data[$row][] = html_print_label_input_block(
     __('Default cache expiration'),
     html_print_extended_select_for_time(
@@ -1372,7 +1361,6 @@ $table_vc->data[$row][] = html_print_label_input_block(
         $intervals
     )
 );
-$row++;
 
 $table_vc->data[$row][] = html_print_label_input_block(
     __('Default interval for refresh on Visual Console'),
@@ -1388,6 +1376,7 @@ $table_vc->data[$row][] = html_print_label_input_block(
         false
     )
 );
+$row++;
 
 $table_vc->data[$row][] = html_print_label_input_block(
     __('Type of view of visual consoles'),
@@ -1401,12 +1390,12 @@ $table_vc->data[$row][] = html_print_label_input_block(
         true
     )
 );
-$row++;
 
 $table_vc->data[$row][] = html_print_label_input_block(
     __('Number of favorite visual consoles to show in the menu'),
     "<input ' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>"
 );
+$row++;
 
 $table_vc->data[$row][] = html_print_label_input_block(
     __('Default line thickness for the Visual Console'),
@@ -1419,7 +1408,6 @@ $table_vc->data[$row][] = html_print_label_input_block(
         true
     )
 );
-$row++;
 
 $table_vc->data[$row][] = html_print_label_input_block(
     __('Lock screen orientation when viewing on mobile devices'),
@@ -1430,6 +1418,7 @@ $table_vc->data[$row][] = html_print_label_input_block(
         true
     )
 );
+$row++;
 
 $table_vc->data[$row][] = html_print_label_input_block(
     __('Display item frame on alert triggered'),
diff --git a/pandora_console/godmode/update_manager/update_manager.history.php b/pandora_console/godmode/update_manager/update_manager.history.php
index e827951e88..7caab40f8b 100644
--- a/pandora_console/godmode/update_manager/update_manager.history.php
+++ b/pandora_console/godmode/update_manager/update_manager.history.php
@@ -50,7 +50,7 @@ try {
         [
             'id'                  => $tableId,
             'class'               => 'info_table',
-            'style'               => 'width: 99%',
+            'style'               => 'width: 100%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'ajax_url'            => 'include/ajax/update_manager',
diff --git a/pandora_console/godmode/wizards/Applications.class.php b/pandora_console/godmode/wizards/Applications.class.php
new file mode 100644
index 0000000000..2237fdbe73
--- /dev/null
+++ b/pandora_console/godmode/wizards/Applications.class.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Applications wizard manager.
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage Applications
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-2021 Artica Soluciones Tecnologicas, http://www.artica.es
+ * This code is NOT free software. This code is NOT licenced under GPL2 licence
+ * You cannnot redistribute it without written permission of copyright holder.
+ * ============================================================================
+ */
+
+require_once $config['homedir'].'/godmode/wizards/Wizard.main.php';
+require_once $config['homedir'].'/include/functions_users.php';
+require_once $config['homedir'].'/include/class/ExtensionsDiscovery.class.php';
+
+/**
+ * Implements Wizard to provide generic Applications wizard.
+ */
+class Applications extends Wizard
+{
+
+    /**
+     * Sub-wizard to be launch (vmware,oracle...).
+     *
+     * @var string
+     */
+    public $mode;
+
+
+    /**
+     * Constructor.
+     *
+     * @param integer $page  Start page, by default 0.
+     * @param string  $msg   Default message to show to users.
+     * @param string  $icon  Target icon to be used.
+     * @param string  $label Target label to be displayed.
+     *
+     * @return mixed
+     */
+    public function __construct(
+        int $page=0,
+        string $msg='Default message. Not set.',
+        string $icon='images/wizard/applications.png',
+        string $label='Applications'
+    ) {
+        $this->setBreadcrum([]);
+
+        $this->access = 'AW';
+        $this->task = [];
+        $this->msg = $msg;
+        $this->icon = $icon;
+        $this->class = $class_style;
+        $this->label = $label;
+        $this->page = $page;
+        $this->url = ui_get_full_url(
+            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=app'
+        );
+
+        return $this;
+    }
+
+
+    /**
+     * Run wizard manager.
+     *
+     * @return mixed Returns null if wizard is ongoing. Result if done.
+     */
+    public function run()
+    {
+        global $config;
+
+        // Load styles.
+        parent::run();
+
+        // Load current wiz. sub-styles.
+        ui_require_css_file(
+            'application',
+            ENTERPRISE_DIR.'/include/styles/wizards/'
+        );
+
+        $mode = get_parameter('mode', null);
+
+        // Load application wizards.
+        $enterprise_classes = glob(
+            $config['homedir'].'/'.ENTERPRISE_DIR.'/include/class/*.app.php'
+        );
+        $extensions = new ExtensionsDiscovery('app', $mode);
+
+        foreach ($enterprise_classes as $classpath) {
+            enterprise_include_once(
+                'include/class/'.basename($classpath)
+            );
+        }
+
+        switch ($mode) {
+            case 'DB2':
+                $classname_selected = 'DB2';
+            break;
+
+            case 'SAP':
+                $classname_selected = 'SAP';
+            break;
+
+            case 'vmware':
+                $classname_selected = 'VMware';
+            break;
+
+            case 'mysql':
+                $classname_selected = 'MySQL';
+            break;
+
+            case 'oracle':
+                $classname_selected = 'Oracle';
+            break;
+
+            case 'MicrosoftSQLServer':
+                $classname_selected = 'MicrosoftSQLServer';
+            break;
+
+            default:
+                $classname_selected = null;
+            break;
+        }
+
+        // Else: class not found pseudo exception.
+        if ($classname_selected !== null) {
+            $wiz = new $classname_selected($this->page);
+            $result = $wiz->run();
+            if (is_array($result) === true) {
+                return $result;
+            }
+        }
+
+        if ($classname_selected === null) {
+            if ($mode !== null) {
+                // Load extension if exist.
+                $extensions->run();
+                return;
+            }
+
+            // Load classes and print selector.
+            $wiz_data = [];
+            foreach ($enterprise_classes as $classpath) {
+                $classname = basename($classpath, '.app.php');
+                $obj = new $classname();
+                $wiz_data[] = $obj->load();
+            }
+
+            $wiz_data = array_merge($wiz_data, $extensions->loadExtensions());
+
+            $this->prepareBreadcrum(
+                [
+                    [
+                        'link'  => ui_get_full_url(
+                            'index.php?sec=gservers&sec2=godmode/servers/discovery'
+                        ),
+                        'label' => __('Discovery'),
+                    ],
+                    [
+                        'link'     => ui_get_full_url(
+                            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=app'
+                        ),
+                        'label'    => __('Applications'),
+                        'selected' => true,
+                    ],
+                ]
+            );
+
+            // Header.
+            ui_print_page_header(
+                __('Applications'),
+                '',
+                false,
+                '',
+                true,
+                '',
+                false,
+                '',
+                GENERIC_SIZE_TEXT,
+                '',
+                $this->printHeader(true)
+            );
+
+            Wizard::printBigButtonsList($wiz_data);
+
+            echo '<div class="app_mssg"><i>*'.__('All company names used here are for identification purposes only. Use of these names, logos, and brands does not imply endorsement.').'</i></div>';
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Check if section have extensions.
+     *
+     * @return boolean Return true if section is empty.
+     */
+    public function isEmpty()
+    {
+        $extensions = new ExtensionsDiscovery('app');
+        $listExtensions = $extensions->getExtensionsApps();
+        if ($listExtensions > 0 || enterprise_installed() === true) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
+}
diff --git a/pandora_console/godmode/wizards/Cloud.class.php b/pandora_console/godmode/wizards/Cloud.class.php
new file mode 100644
index 0000000000..4664b1a566
--- /dev/null
+++ b/pandora_console/godmode/wizards/Cloud.class.php
@@ -0,0 +1,661 @@
+<?php
+/**
+ * Cloud wizard manager.
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage Cloud
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-2021 Artica Soluciones Tecnologicas, http://www.artica.es
+ * This code is NOT free software. This code is NOT licenced under GPL2 licence
+ * You cannnot redistribute it without written permission of copyright holder.
+ * ============================================================================
+ */
+
+global $config;
+
+require_once $config['homedir'].'/godmode/wizards/Wizard.main.php';
+require_once $config['homedir'].'/include/functions_users.php';
+require_once $config['homedir'].'/include/class/CredentialStore.class.php';
+
+/**
+ * Implements Wizard to provide generic Cloud wizard.
+ */
+class Cloud extends Wizard
+{
+
+    /**
+     * Sub-wizard to be launch (vmware,oracle...).
+     *
+     * @var string
+     */
+    public $mode;
+
+    /**
+     * Discovery task data.
+     *
+     * @var array.
+     */
+    public $task;
+
+    /**
+     * General maxPages.
+     *
+     * @var integer
+     */
+    public $maxPages;
+
+    /**
+     * Product string.
+     *
+     * @var string
+     */
+    protected $product = '';
+
+    /**
+     * Credentials store identifier.
+     *
+     * @var string
+     */
+    protected $keyIdentifier = null;
+
+    /**
+     * Credentials store product identifier.
+     *
+     * @var string
+     */
+    protected $keyStoreType = null;
+
+
+    /**
+     * Constructor.
+     *
+     * @param integer $page  Start page, by default 0.
+     * @param string  $msg   Default message to show to users.
+     * @param string  $icon  Target icon to be used.
+     * @param string  $label Target label to be displayed.
+     *
+     * @return mixed
+     */
+    public function __construct(
+        int $page=0,
+        string $msg='Default message. Not set.',
+        string $icon='images/wizard/cloud.png',
+        string $label='Cloud'
+    ) {
+        $this->setBreadcrum([]);
+
+        $this->access = 'AW';
+        $this->task = [];
+        $this->msg = $msg;
+        $this->icon = $icon;
+        $this->label = $label;
+        $this->page = $page;
+        $this->url = ui_get_full_url(
+            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=cloud'
+        );
+
+        return $this;
+    }
+
+
+    /**
+     * Run wizard manager.
+     *
+     * @return mixed Returns null if wizard is ongoing. Result if done.
+     */
+    public function run()
+    {
+        global $config;
+
+        // Load styles.
+        parent::run();
+
+        // Load current wiz. sub-styles.
+        ui_require_css_file(
+            'cloud',
+            ENTERPRISE_DIR.'/include/styles/wizards/'
+        );
+
+        $mode = get_parameter('mode', null);
+
+        // Load cloud wizards.
+        $enterprise_classes = glob(
+            $config['homedir'].'/'.ENTERPRISE_DIR.'/include/class/*.cloud.php'
+        );
+        $extensions = new ExtensionsDiscovery('cloud', $mode);
+
+        foreach ($enterprise_classes as $classpath) {
+            enterprise_include_once(
+                'include/class/'.basename($classpath)
+            );
+        }
+
+        switch ($mode) {
+            case 'amazonws':
+                $classname_selected = 'Aws';
+            break;
+
+            case 'azure':
+                $classname_selected = 'Azure';
+            break;
+
+            case 'gcp':
+                $classname_selected = 'Google';
+            break;
+
+            default:
+                $classname_selected = null;
+            break;
+        }
+
+        // Else: class not found pseudo exception.
+        if ($classname_selected !== null) {
+            $wiz = new $classname_selected($this->page);
+            $result = $wiz->run();
+            if (is_array($result) === true) {
+                return $result;
+            }
+        }
+
+        if ($classname_selected === null) {
+            if ($mode !== null) {
+                // Load extension if exist.
+                $extensions->run();
+                return;
+            }
+
+            // Load classes and print selector.
+            $wiz_data = [];
+            foreach ($enterprise_classes as $classpath) {
+                $classname = basename($classpath, '.cloud.php');
+                $obj = new $classname();
+                $wiz_data[] = $obj->load();
+            }
+
+            $wiz_data = array_merge($wiz_data, $extensions->loadExtensions());
+
+            $this->prepareBreadcrum(
+                [
+                    [
+                        'link'  => ui_get_full_url(
+                            'index.php?sec=gservers&sec2=godmode/servers/discovery'
+                        ),
+                        'label' => __('Discovery'),
+                    ],
+                    [
+                        'link'     => $this->url,
+                        'label'    => __('Cloud'),
+                        'selected' => true,
+                    ],
+                ],
+                true
+            );
+
+            // Header.
+            ui_print_page_header(
+                __('Cloud'),
+                '',
+                false,
+                '',
+                true,
+                '',
+                false,
+                '',
+                GENERIC_SIZE_TEXT,
+                '',
+                $this->printHeader(true)
+            );
+
+            Wizard::printBigButtonsList($wiz_data);
+
+            echo '<div class="app_mssg"><i>*'.__('All company names used here are for identification purposes only. Use of these names, logos, and brands does not imply endorsement.').'</i></div>';
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Run credentials wizard.
+     *
+     * @return boolean True if credentials wizard is displayed and false if not.
+     */
+    public function runCredentials()
+    {
+        global $config;
+
+        if ($this->status === false) {
+            $empty_account = true;
+        }
+
+        // Checks credentials. If check not passed. Show the form to fill it.
+        if ($this->checkCredentials()) {
+            return true;
+        }
+
+        // Add breadcrum and print header.
+        $this->prepareBreadcrum(
+            [
+                [
+                    'link'     => $this->url.'&credentials=1',
+                    'label'    => __('%s credentials', $this->product),
+                    'selected' => true,
+                ],
+            ],
+            true
+        );
+        // Header.
+        ui_print_page_header(
+            __('%s credentials', $this->product),
+            '',
+            false,
+            $this->product.'_credentials_tab',
+            true,
+            '',
+            false,
+            '',
+            GENERIC_SIZE_TEXT,
+            '',
+            $this->printHeader(true)
+        );
+
+        if ($this->product === 'Aws') {
+            ui_print_warning_message(
+                __(
+                    'If a task with the selected credentials is already running, it will be edited. To create a new one, another account from the credential store must be selected.'
+                )
+            );
+        }
+
+        if ($this->status === true) {
+            ui_print_success_message($this->msg);
+        } else if ($this->status === false) {
+            ui_print_error_message($this->msg);
+        }
+
+        if ($empty_account === true) {
+            ui_print_error_message($this->msg);
+        }
+
+        $link_to_cs = '';
+        if (check_acl($config['id_user'], 0, 'UM')) {
+            $link_to_cs = '<a class="ext_link" href="'.ui_get_full_url(
+                'index.php?sec=gmodules&sec2=godmode/groups/group_list&tab=credbox'
+            ).'" >';
+            $link_to_cs .= __('Manage accounts').'</a>';
+        }
+
+        $this->getCredentials();
+        $this->printFormAsList(
+            [
+                'form'   => [
+                    'action' => $this->url,
+                    'method' => 'POST',
+                    'id'     => 'form-credentials',
+                ],
+                'inputs' => [
+                    [
+                        'label'     => __('Cloud tool full path'),
+                        'arguments' => [
+                            'name'  => 'cloud_util_path',
+                            'value' => isset($config['cloud_util_path']) ? io_safe_output($config['cloud_util_path']) : '/usr/bin/pandora-cm-api',
+                            'type'  => 'text',
+                        ],
+                    ],
+                    [
+                        'label'     => __('Account'),
+                        'extra'     => $link_to_cs,
+                        'arguments' => [
+                            'name'     => 'account_identifier',
+                            'type'     => 'select',
+                            'fields'   => CredentialStore::getKeys($this->keyStoreType),
+                            'selected' => $this->keyIdentifier,
+                            'return'   => true,
+                        ],
+                    ],
+                    [
+                        'arguments' => [
+                            'name'   => 'parse_credentials',
+                            'value'  => 1,
+                            'type'   => 'hidden',
+                            'return' => true,
+                        ],
+                    ],
+                ],
+            ]
+        );
+
+        $buttons_form = $this->printInput(
+            [
+                'name'       => 'submit',
+                'label'      => __('Validate'),
+                'type'       => 'submit',
+                'attributes' => [
+                    'icon' => 'wand',
+                    'form' => 'form-credentials',
+                ],
+                'return'     => true,
+                'width'      => 'initial',
+            ]
+        );
+
+        $buttons_form .= $this->printGoBackButton(
+            ui_get_full_url(
+                'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=cloud'
+            ),
+            true
+        );
+
+        html_print_action_buttons($buttons_form);
+        return false;
+    }
+
+
+    /**
+     * Check credentials.
+     *
+     * @return boolean True if credentials are OK.
+     */
+    public function checkCredentials()
+    {
+        global $config;
+
+        $pandora = io_safe_output($config['cloud_util_path']);
+
+        if (isset($pandora) === false) {
+            config_update_value('cloud_util_path', '/usr/bin/pandora-cm-api');
+        }
+
+        if ((bool) get_parameter('disconnect_account', false) === true) {
+            $this->status = null;
+            return false;
+        }
+
+        if ($this->keyIdentifier === null) {
+            // Ask user for available credentials.
+            $this->msg = __('Select a set of credentials from the list');
+            $this->status = null;
+            return false;
+        }
+
+        $credentials = $this->getCredentials($this->keyIdentifier);
+
+        if (empty($credentials['username']) === true
+            || empty($credentials['password']) === true
+            || isset($pandora) === false
+            || is_executable($pandora) === false
+        ) {
+            if (is_executable($pandora) === false) {
+                $this->msg = (__('Path %s is not executable.', $pandora));
+                $this->status = false;
+            } else {
+                $this->msg = __('Invalid username or password');
+                $this->status = false;
+            }
+
+            return false;
+        }
+
+        try {
+            $value = $this->executeCMCommand('--get availability');
+        } catch (Exception $e) {
+            $this->msg = $e->getMessage();
+            $this->status = false;
+            return false;
+        }
+
+        if ($value == '1') {
+            return true;
+        }
+
+        $this->status = false;
+
+        // Error message directly from pandora-cm-api.
+        $this->msg = str_replace('"', '', $value);
+
+        return false;
+    }
+
+
+    /**
+     * Handle the click on disconnect account link.
+     *
+     * @return void But it prints some info to user.
+     */
+    protected function parseDisconnectAccount()
+    {
+        // Check if disconection account link is pressed.
+        if ((bool) get_parameter('disconnect_account') === false) {
+            return;
+        }
+
+        $ret = $this->setCredentials(null);
+        if ($ret) {
+            $this->msg = __('Account disconnected');
+        } else {
+            $this->msg = __('Failed disconnecting account');
+        }
+
+        $this->status = $ret;
+        $this->page = 0;
+    }
+
+
+    /**
+     * Build an array with Product credentials.
+     *
+     * @return array with credentials (pass and id).
+     */
+    public function getCredentials()
+    {
+        return CredentialStore::getKey($this->keyIdentifier);
+    }
+
+
+    /**
+     * Set Product credentials.
+     *
+     * @param string|null $identifier Credential store identifier.
+     *
+     * @return boolean True if success.
+     */
+    public function setCredentials($identifier)
+    {
+        if ($identifier === null) {
+            unset($this->keyIdentifier);
+            return true;
+        }
+
+        if (isset($identifier) === false) {
+            return false;
+        }
+
+        $all = CredentialStore::getKeys($this->type);
+
+        if (in_array($identifier, $all) === true) {
+            $this->keyIdentifier = $identifier;
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Parse credentials form.
+     *
+     * @return void But it prints a message.
+     */
+    protected function parseCredentials()
+    {
+        global $config;
+
+        if (!$this->keyIdentifier) {
+            $this->setCredentials(get_parameter('ki', null));
+        }
+
+        // Check if credentials form is submitted.
+        if ((bool) get_parameter('parse_credentials') === false) {
+            return;
+        }
+
+        $this->page = 0;
+        $ret = $this->setCredentials(
+            get_parameter('account_identifier')
+        );
+
+        $path = get_parameter('cloud_util_path');
+        $ret_path = config_update_value('cloud_util_path', $path);
+        if ($ret_path) {
+            $config['cloud_util_path'] = $path;
+        }
+
+        if ($ret && $ret_path) {
+            $this->msg = __('Credentials successfully updated');
+        } else {
+            $this->msg = __('Failed updating credentials process');
+        }
+
+        $this->status = ($ret && $ret_path);
+    }
+
+
+    /**
+     * This method must be implemented.
+     *
+     * Execute a pandora-cm-api request.
+     *
+     * @param string $command Command to execute.
+     *
+     * @return void But must return string STDOUT of executed command.
+     * @throws Exception If not implemented.
+     */
+    protected function executeCMCommand($command)
+    {
+        throw new Exception('executeCMCommand must be implemented.');
+    }
+
+
+    /**
+     * Get a recon token value
+     *
+     * @param string $token The recon key to retrieve.
+     *
+     * @return string String with the value.
+     */
+    protected function getConfigReconElement($token)
+    {
+        if ($this->reconConfig === false
+            || isset($this->reconConfig[0][$token]) === false
+        ) {
+            if (is_array($this->task) === true
+                && isset($this->task[$token]) === true
+            ) {
+                return $this->task[$token];
+            } else {
+                return '';
+            }
+        } else {
+            return $this->reconConfig[0][$token];
+        }
+    }
+
+
+    /**
+     * Print global inputs
+     *
+     * @param boolean $last True if is last element.
+     *
+     * @return array Array with all global inputs.
+     */
+    protected function getGlobalInputs(bool $last=false)
+    {
+        $task_id = $this->task['id_rt'];
+        if (!$task_id) {
+            $task_id = $this->getConfigReconElement('id_rt');
+        }
+
+        return [
+            [
+                'arguments' => [
+                    'name'   => 'page',
+                    'value'  => ($this->page + 1),
+                    'type'   => 'hidden',
+                    'return' => true,
+                ],
+            ],
+            [
+                'arguments' => [
+                    'name'       => 'submit',
+                    'label'      => ($last) ? __('Finish') : __('Next'),
+                    'type'       => 'submit',
+                    'attributes' => 'class="sub '.(($last) ? 'wand' : 'next').'"',
+                    'return'     => true,
+                ],
+            ],
+            [
+                'arguments' => [
+                    'name'   => 'task',
+                    'value'  => $task_id,
+                    'type'   => 'hidden',
+                    'return' => true,
+                ],
+            ],
+            [
+                'arguments' => [
+                    'name'   => 'parse_form',
+                    'value'  => 1,
+                    'type'   => 'hidden',
+                    'return' => true,
+                ],
+            ],
+        ];
+    }
+
+
+    /**
+     * Print required css in some points.
+     *
+     * @return string With js code.
+     */
+    protected function cloudJS()
+    {
+        return '
+            function toggleCloudSubmenu(curr_elem, id_csm){
+                if (document.getElementsByName(curr_elem)[0].checked){
+                    $("#li-"+id_csm).show();
+                } else {
+                    $("#li-"+id_csm).hide();
+                }
+            };
+        ';
+    }
+
+
+    /**
+     * Check if section have extensions.
+     *
+     * @return boolean Return true if section is empty.
+     */
+    public function isEmpty()
+    {
+        $extensions = new ExtensionsDiscovery('cloud');
+        $listExtensions = $extensions->getExtensionsApps();
+        if ($listExtensions > 0 || enterprise_installed() === true) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
+}
diff --git a/pandora_console/godmode/wizards/Custom.class.php b/pandora_console/godmode/wizards/Custom.class.php
new file mode 100644
index 0000000000..41a177b3e3
--- /dev/null
+++ b/pandora_console/godmode/wizards/Custom.class.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Custom wizard manager.
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage Custom
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-2021 Artica Soluciones Tecnologicas, http://www.artica.es
+ * This code is NOT free software. This code is NOT licenced under GPL2 licence
+ * You cannnot redistribute it without written permission of copyright holder.
+ * ============================================================================
+ */
+
+require_once $config['homedir'].'/godmode/wizards/Wizard.main.php';
+require_once $config['homedir'].'/include/functions_users.php';
+require_once $config['homedir'].'/include/class/ExtensionsDiscovery.class.php';
+
+/**
+ * Implements Wizard to provide generic Custom wizard.
+ */
+class Custom extends Wizard
+{
+
+    /**
+     * Sub-wizard to be launch (vmware,oracle...).
+     *
+     * @var string
+     */
+    public $mode;
+
+
+    /**
+     * Constructor.
+     *
+     * @param integer $page  Start page, by default 0.
+     * @param string  $msg   Default message to show to users.
+     * @param string  $icon  Target icon to be used.
+     * @param string  $label Target label to be displayed.
+     *
+     * @return mixed
+     */
+    public function __construct(
+        int $page=0,
+        string $msg='Default message. Not set.',
+        string $icon='/images/wizard/Custom_apps@svg.svg',
+        string $label='Custom'
+    ) {
+        $this->setBreadcrum([]);
+
+        $this->access = 'AW';
+        $this->task = [];
+        $this->msg = $msg;
+        $this->icon = $icon;
+        $this->class = $class_style;
+        $this->label = $label;
+        $this->page = $page;
+        $this->url = ui_get_full_url(
+            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=custom'
+        );
+
+        return $this;
+    }
+
+
+    /**
+     * Run wizard manager.
+     *
+     * @return mixed Returns null if wizard is ongoing. Result if done.
+     */
+    public function run()
+    {
+        global $config;
+
+        // Load styles.
+        parent::run();
+
+        // Load current wiz. sub-styles.
+        ui_require_css_file(
+            'custom',
+            ENTERPRISE_DIR.'/include/styles/wizards/'
+        );
+
+        $mode = get_parameter('mode', null);
+        $extensions = new ExtensionsDiscovery('custom', $mode);
+        if ($mode !== null) {
+            // Load extension if exist.
+            $extensions->run();
+            return;
+        }
+
+        // Load classes and print selector.
+        $wiz_data = $extensions->loadExtensions();
+
+        $this->prepareBreadcrum(
+            [
+                [
+                    'link'  => ui_get_full_url(
+                        'index.php?sec=gservers&sec2=godmode/servers/discovery'
+                    ),
+                    'label' => __('Discovery'),
+                ],
+                [
+                    'link'     => ui_get_full_url(
+                        'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=custom'
+                    ),
+                    'label'    => __('Custom'),
+                    'selected' => true,
+                ],
+            ]
+        );
+
+        // Header.
+        ui_print_page_header(
+            __('Custom'),
+            '',
+            false,
+            '',
+            true,
+            '',
+            false,
+            '',
+            GENERIC_SIZE_TEXT,
+            '',
+            $this->printHeader(true)
+        );
+
+        Wizard::printBigButtonsList($wiz_data);
+
+        echo '<div class="app_mssg"><i>*'.__('All company names used here are for identification purposes only. Use of these names, logos, and brands does not imply endorsement.').'</i></div>';
+        return $result;
+    }
+
+
+    /**
+     * Check if section have extensions.
+     *
+     * @return boolean Return true if section is empty.
+     */
+    public function isEmpty()
+    {
+        $extensions = new ExtensionsDiscovery('custom');
+        $listExtensions = $extensions->getExtensionsApps();
+        if ($listExtensions > 0) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
+}
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index e659f85e9e..1c7ffe5526 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -129,6 +129,11 @@ class DiscoveryTaskList extends HTML
         }
 
         $delete_console_task = (bool) get_parameter('delete_console_task');
+        $report_task = (bool) get_parameter('report_task', 0);
+        if ($report_task === true) {
+            $this->url = ui_get_full_url('index.php?sec=reporting&sec2=godmode/reporting/reporting_builder');
+        }
+
         if ($delete_console_task === true) {
             return $this->deleteConsoleTask();
         }
@@ -163,7 +168,10 @@ class DiscoveryTaskList extends HTML
         }
 
         if (is_reporting_console_node() === false) {
-            $ret2 = $this->showList();
+            $ret2 = $this->showList(__('Host & devices tasks'), [0, 1]);
+            $ret2 .= $this->showList(__('Applications tasks'), [3, 4, 5, 10, 11, 12], 'app');
+            $ret2 .= $this->showList(__('Cloud tasks'), [6, 7, 8, 13, 14], 'cloud');
+            $ret2 .= $this->showList(__('Custom tasks'), [-1], 'custom');
         }
 
         if ($ret === false && $ret2 === false) {
@@ -287,6 +295,10 @@ class DiscoveryTaskList extends HTML
         }
 
         $id_console_task = (int) get_parameter('id_console_task');
+        $report_task = (bool) get_parameter('report_task', 0);
+        if ($report_task === true) {
+            $this->url = ui_get_full_url('index.php?sec=reporting&sec2=godmode/reporting/reporting_builder');
+        }
 
         if ($id_console_task != null) {
             // --------------------------------
@@ -352,6 +364,10 @@ class DiscoveryTaskList extends HTML
         }
 
         $id_console_task = (int) get_parameter('id_console_task');
+        $report_task = (bool) get_parameter('report_task', 0);
+        if ($report_task === true) {
+            $this->url = ui_get_full_url('index.php?sec=reporting&sec2=godmode/reporting/reporting_builder');
+        }
 
         if ($id_console_task > 0) {
             $result = db_process_sql_update(
@@ -505,9 +521,13 @@ class DiscoveryTaskList extends HTML
     /**
      * Show complete list of running tasks.
      *
+     * @param string  $titleTable        Title of section.
+     * @param array   $filter            Ids array from apps for filter.
+     * @param boolean $extension_section Extension to add in table.
+     *
      * @return boolean Success or not.
      */
-    public function showList()
+    public function showList($titleTable, $filter, $extension_section=false)
     {
         global $config;
 
@@ -531,7 +551,16 @@ class DiscoveryTaskList extends HTML
             include_once $config['homedir'].'/include/functions_network_profiles.php';
 
             if (users_is_admin()) {
-                $recon_tasks = db_get_all_rows_sql('SELECT * FROM trecon_task');
+                $recon_tasks = db_get_all_rows_sql(
+                    sprintf(
+                        'SELECT tasks.*, apps.section AS section, apps.short_name AS short_name
+                        FROM trecon_task tasks
+                        LEFT JOIN tdiscovery_apps apps ON tasks.id_app = apps.id_app
+                        WHERE type IN (%s) OR section = "%s"',
+                        implode(',', $filter),
+                        $extension_section
+                    )
+                );
             } else {
                 $user_groups = implode(
                     ',',
@@ -539,9 +568,14 @@ class DiscoveryTaskList extends HTML
                 );
                 $recon_tasks = db_get_all_rows_sql(
                     sprintf(
-                        'SELECT * FROM trecon_task
-                        WHERE id_group IN (%s)',
-                        $user_groups
+                        'SELECT tasks.*, apps.section AS section, apps.short_name AS short_name
+                        FROM trecon_task
+                        LEFT JOIN tdiscovery_apps apps ON tasks.id_app = apps.id_app
+                        WHERE id_group IN (%s) AND
+                        (type IN (%s) OR section = "%s")',
+                        $user_groups,
+                        implode(',', $filter),
+                        $extension_section
                     )
                 );
             }
@@ -658,7 +692,9 @@ class DiscoveryTaskList extends HTML
                     $recon_script_name = false;
                 }
 
-                if ($task['disabled'] == 0 && $server_name !== '') {
+                if (($task['disabled'] == 0 && $server_name !== '' && (int) $task['type'] !== DISCOVERY_EXTENSION)
+                    || ((int) $task['type'] === DISCOVERY_EXTENSION && (int) $task['setup_complete'] === 1)
+                ) {
                     if (check_acl($config['id_user'], 0, 'AW')) {
                         $data[0] = '<span class="link" onclick="force_task(\'';
                         $data[0] .= ui_get_full_url(
@@ -682,7 +718,9 @@ class DiscoveryTaskList extends HTML
                         );
                         $data[0] .= '</span>';
                     }
-                } else if ($task['disabled'] == 2) {
+                } else if ($task['disabled'] == 2
+                    || ((int) $task['type'] === DISCOVERY_EXTENSION && (int) $task['setup_complete'] === 0)
+                ) {
                     $data[0] = ui_print_help_tip(
                         __('This task has not been completely defined, please edit it'),
                         true
@@ -843,6 +881,19 @@ class DiscoveryTaskList extends HTML
                         $data[6] .= __('Discovery.App.Microsoft SQL Server');
                     break;
 
+                    case DISCOVERY_EXTENSION:
+                        // Discovery NetScan.
+                        $data[6] = html_print_image(
+                            'images/cluster@os.svg',
+                            true,
+                            [
+                                'title' => $task['short_name'],
+                                'class' => 'main_menu_icon invert_filter',
+                            ]
+                        ).'&nbsp;&nbsp;';
+                        $data[6] .= $task['short_name'];
+                    break;
+
                     case DISCOVERY_HOSTDEVICES:
                     default:
                         if ($task['id_recon_script'] == 0) {
@@ -941,7 +992,7 @@ class DiscoveryTaskList extends HTML
                         && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
                         && $task['type'] != DISCOVERY_CLOUD_AWS_S3
                     ) {
-                        if (check_acl($config['id_user'], 0, 'MR')) {
+                        if (check_acl($config['id_user'], 0, 'MR') && (int) $task['type'] !== 15) {
                             $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
                             $data[9] .= html_print_image(
                                 'images/web@groups.svg',
@@ -999,13 +1050,24 @@ class DiscoveryTaskList extends HTML
                                 ).'</a>';
                             }
                         } else {
+                            $url_edit = sprintf(
+                                'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
+                                $this->getTargetWiz($task, $recon_script_data),
+                                $task['id_rt']
+                            );
+
+                            if ((int) $task['type'] === DISCOVERY_EXTENSION) {
+                                $url_edit = sprintf(
+                                    'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=%s&mode=%s&id_task=%s',
+                                    $task['section'],
+                                    $task['short_name'],
+                                    $task['id_rt'],
+                                );
+                            }
+
                             // Check if is a H&D, Cloud or Application or IPAM.
                             $data[9] .= '<a href="'.ui_get_full_url(
-                                sprintf(
-                                    'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
-                                    $this->getTargetWiz($task, $recon_script_data),
-                                    $task['id_rt']
-                                )
+                                $url_edit
                             ).'">'.html_print_image(
                                 'images/edit.svg',
                                 true,
@@ -1069,7 +1131,7 @@ class DiscoveryTaskList extends HTML
                 $return = true;
             }
 
-            ui_toggle($content, __('Server Tasks'), '', '', false);
+            ui_toggle($content, $titleTable, '', '', false);
 
             // Div neccesary for modal map task.
             echo '<div id="map_task" class="invisible"></div>';
@@ -1096,9 +1158,9 @@ class DiscoveryTaskList extends HTML
      *
      * @return boolean Success or not.
      */
-    public function showListConsoleTask()
+    public function showListConsoleTask($report_task=false)
     {
-        return enterprise_hook('tasklist_showListConsoleTask', [$this]);
+        return enterprise_hook('tasklist_showListConsoleTask', [$this, $report_task]);
     }
 
 
@@ -1227,7 +1289,7 @@ class DiscoveryTaskList extends HTML
             ($task['status'] < 0) ? 100 : $task['status'],
             150,
             150,
-            '#3A3A3A',
+            '#14524f',
             '%',
             '',
             '#ececec',
@@ -1297,7 +1359,7 @@ class DiscoveryTaskList extends HTML
                 $task['stats']['c_network_percent'],
                 150,
                 150,
-                '#3A3A3A',
+                '#14524f',
                 '%',
                 '',
                 '#ececec',
@@ -1340,14 +1402,14 @@ class DiscoveryTaskList extends HTML
 
         $output = '';
 
-        if (is_array($task['stats']) === false) {
-            $task['stats'] = json_decode($task['summary'], true);
+        if (is_array($task['stats']) === false && (int) $task['type'] !== DISCOVERY_EXTENSION) {
+            $task['stats'] = json_decode(io_safe_output($task['summary']), true);
             if (json_last_error() !== JSON_ERROR_NONE) {
                 return $task['summary'];
             }
         }
 
-        if (is_array($task['stats'])) {
+        if (is_array($task['stats']) || (int) $task['type'] === DISCOVERY_EXTENSION) {
             $i = 0;
             $table = new StdClasS();
             $table->class = 'databox data';
@@ -1405,6 +1467,65 @@ class DiscoveryTaskList extends HTML
                 $table->data[$i][1] = '<span id="alive">';
                 $table->data[$i][1] .= ($total - $agents);
                 $table->data[$i++][1] .= '</span>';
+            } else if ((int) $task['type'] === DISCOVERY_EXTENSION) {
+                // Content.
+                $countSummary = 1;
+                if (is_array($task['stats']) === true && count(array_filter(array_keys($task['stats']), 'is_numeric')) === count($task['stats'])) {
+                    foreach ($task['stats'] as $key => $summary) {
+                        $table->data[$i][0] = '<b>'.__('Summary').' '.$countSummary.'</b>';
+                        $table->data[$i][1] = '';
+                        $countSummary++;
+                        $i++;
+                        if (is_array($summary) === true) {
+                            if (empty($summary['summary']) === true && empty($summary['info']) === true) {
+                                $table->data[$i][0] = json_encode($summary, JSON_PRETTY_PRINT);
+                                $table->data[$i][1] = '';
+                                $i++;
+                                continue;
+                            }
+
+                            $unknownJson = $summary;
+                            foreach ($summary as $k2 => $v) {
+                                if (is_array($v) === true) {
+                                    if ($k2 === 'summary') {
+                                        foreach ($v as $k3 => $v2) {
+                                            $table->data[$i][0] = $k3;
+                                            $table->data[$i][1] = $v2;
+                                            $i++;
+                                        }
+
+                                        unset($unknownJson[$k2]);
+                                    }
+                                } else {
+                                    if ($k2 === 'info') {
+                                        $table->data[$i][0] = $v;
+                                        $table->data[$i][1] = '';
+                                        $i++;
+
+                                        unset($unknownJson[$k2]);
+                                    }
+                                }
+                            }
+
+                            if (empty($unknownJson) === false) {
+                                $table->data[$i][0] = json_encode($unknownJson, JSON_PRETTY_PRINT);
+                                $table->data[$i][1] = '';
+                                $i++;
+                            }
+                        } else {
+                            $table->data[$i][0] = $summary;
+                            $table->data[$i][1] = '';
+                            $i++;
+                        }
+                    }
+                } else {
+                    $table->data[$i][0] = '<b>'.__('Summary').'</b>';
+                    $table->data[$i][1] = '';
+                    $i++;
+                    $table->data[$i][0] = $task['summary'];
+                    $table->data[$i][1] = '';
+                    $i++;
+                }
             } else {
                 // Content.
                 if (is_array($task['stats']['summary']) === true) {
@@ -1466,7 +1587,7 @@ class DiscoveryTaskList extends HTML
         }
 
         $task = db_get_row('trecon_task', 'id_rt', $id_task);
-        $task['stats'] = json_decode($task['summary'], true);
+        $task['stats'] = json_decode(io_safe_output($task['summary']), true);
         $summary = $this->progressTaskSummary($task);
 
         $output = '';
@@ -1859,7 +1980,11 @@ class DiscoveryTaskList extends HTML
             if ($task['status'] <= 0
                 && empty($task['summary']) === false
             ) {
-                $status = __('Done');
+                if ($task['status'] == -2) {
+                    $status = __('Failed');
+                } else {
+                    $status = __('Done');
+                }
             } else if ($task['utimestamp'] == 0
                 && empty($task['summary'])
             ) {
diff --git a/pandora_console/godmode/wizards/ManageExtensions.class.php b/pandora_console/godmode/wizards/ManageExtensions.class.php
new file mode 100644
index 0000000000..03b1bdee7b
--- /dev/null
+++ b/pandora_console/godmode/wizards/ManageExtensions.class.php
@@ -0,0 +1,1054 @@
+<?php
+/**
+ * Manage Extensions wizard for Pandora FMS Discovery
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage ManageExtensions
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-2021 Artica Soluciones Tecnologicas, http://www.artica.es
+ * This code is NOT free software. This code is NOT licenced under GPL2 licence
+ * You cannnot redistribute it without written permission of copyright holder.
+ * ============================================================================
+ */
+
+use PandoraFMS\Tools\Files;
+require_once $config['homedir'].'/include/class/ExtensionsDiscovery.class.php';
+
+/**
+ * Manage interface for upload new extensions in discovery.
+ */
+class ManageExtensions extends HTML
+{
+
+    /**
+     * Allowed methods to be called using AJAX request.
+     *
+     * @var array
+     */
+    public $AJAXMethods = [
+        'getExtensionsInstalled',
+        'validateIniName',
+    ];
+
+    /**
+     * Url of controller.
+     *
+     * @var string
+     */
+    public $ajaxController;
+
+    /**
+     * Icon of section
+     *
+     * @var string
+     */
+    public $icon = '/images/wizard/Configurar_app@svg.svg';
+
+    /**
+     * Name of section
+     *
+     * @var string
+     */
+    public $label = 'Manage disco packages';
+
+    /**
+     * Url of section
+     *
+     * @var string
+     */
+    public $url;
+
+    /**
+     * Path of the installation extension.
+     *
+     * @var string
+     */
+    public $path = 'attachment/discovery';
+
+    /**
+     * Ini file from extension.
+     *
+     * @var array
+     */
+    public $iniFile;
+
+    /**
+     * Default logo
+     *
+     * @var string
+     */
+    public $defaultLogo = '/images/wizard/app_generico.svg';
+
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        global $config;
+        $this->ajaxController = $config['homedir'].'/include/ajax/manage_extensions.ajax';
+        $this->url = ui_get_full_url(
+            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=magextensions'
+        );
+    }
+
+
+    /**
+     * Checks if target method is available to be called using AJAX.
+     *
+     * @param string $method Target method.
+     *
+     * @return boolean True allowed, false not.
+     */
+    public function ajaxMethod($method)
+    {
+        // Check access.
+        check_login();
+
+        return in_array($method, $this->AJAXMethods);
+    }
+
+
+    /**
+     * Implements load method.
+     *
+     * @return mixed Skeleton for button.
+     */
+    public function load()
+    {
+        return [
+            'icon'  => $this->icon,
+            'label' => $this->label,
+            'url'   => $this->url,
+
+        ];
+
+    }
+
+
+    /**
+     * Generates a JSON error.
+     *
+     * @param string $msg Error message.
+     *
+     * @return void
+     */
+    public function errorAjax(string $msg)
+    {
+        echo json_encode(
+            ['error' => $msg]
+        );
+    }
+
+
+    /**
+     * Implements run method.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        global $config;
+        // Load styles.
+        parent::run();
+
+        $uploadDisco = get_parameter('upload_disco', '');
+        $action = get_parameter('action', '');
+        $shortName = get_parameter('short_name', '');
+
+        if (empty($uploadDisco) === false) {
+            if ($_FILES['file']['error'] == 0) {
+                $result = $this->uploadExtension($_FILES['file']);
+                if ($result === true) {
+                    ui_print_success_message(
+                        __('Uploaded extension')
+                    );
+                } else {
+                    if (is_string($result)) {
+                        echo $this->error($result);
+                    } else {
+                        echo $this->error(__('Failed to upload extension'));
+                    }
+                }
+            } else {
+                echo $this->error(__('Failed to upload extension'));
+            }
+        }
+
+        if (empty($action) === false && empty($shortName) === false) {
+            switch ($action) {
+                case 'delete':
+                    $result = $this->uninstallExtension($shortName);
+                    if ($result === true) {
+                        ui_print_success_message(
+                            __('Deleted extension')
+                        );
+                    } else {
+                        echo $this->error(__('Fail delete extension'));
+                    }
+
+                case 'sync_server':
+                    $syncAction = get_parameter('sync_action', '');
+                    if ($syncAction === 'refresh') {
+                        $installationFolder = $config['homedir'].'/'.$this->path.'/'.$shortName;
+                        $result = $this->copyExtensionToServer($installationFolder, $shortName);
+                        if ($result === true) {
+                            ui_print_success_message(
+                                __('Extension folder created successfully')
+                            );
+                        } else {
+                            echo $this->error(__('Fail created extension folder'));
+                        }
+                    }
+                break;
+
+                default:
+                continue;
+            }
+        }
+
+        $this->prepareBreadcrum(
+            [
+                [
+                    'link'  => ui_get_full_url(
+                        'index.php?sec=gservers&sec2=godmode/servers/discovery'
+                    ),
+                    'label' => __('Discovery'),
+                ],
+                [
+                    'link'     => '',
+                    'label'    => _('Manage disco packages'),
+                    'selected' => 1,
+                ],
+            ]
+        );
+
+        // Header.
+        ui_print_page_header(
+            __('Manage disco packages'),
+            '',
+            false,
+            '',
+            true,
+            '',
+            false,
+            '',
+            GENERIC_SIZE_TEXT,
+            '',
+            $this->printHeader(true)
+        );
+
+        $table = new stdClass();
+        $table->width = '100%';
+        $table->class = 'databox filters';
+        $table->size = [];
+        $table->size[0] = '80%';
+        $table->align[3] = 'right';
+        $table->data = [];
+        $table->data[0][0] = html_print_label_input_block(
+            __('Load DISCO'),
+            html_print_div(
+                [
+                    'id'      => 'upload_file',
+                    'content' => html_print_input_file(
+                        'file',
+                        true,
+                        ['style' => 'width:100%']
+                    ),
+                    'class'   => 'mrgn_top_15px',
+                ],
+                true
+            )
+        );
+        $table->data[0][3] = html_print_submit_button(
+            __('Upload DISCO'),
+            'upload_button',
+            false,
+            [
+                'class' => 'sub ok float-right',
+                'icon'  => 'next',
+            ],
+            true
+        );
+
+        echo '<form id="uploadExtension" enctype="multipart/form-data" action="index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=magextensions" method="POST">';
+        html_print_input_hidden('upload_disco', 1);
+        html_print_table($table);
+        echo '<div class="action-buttons w700px">';
+
+        echo '</div>';
+        echo '</form>';
+
+        echo '<script type="text/javascript">
+                var page = "'.$this->ajaxController.'";
+                var textsToTranslate = {
+                    "Warning": "'.__('Warning').'",
+                    "Confirm": "'.__('Confirm').'",
+                    "Cancel": "'.__('Cancel').'",
+                    "Error": "'.__('Error').'",
+                    "Ok": "'.__('Ok').'",
+                    "Failed to upload extension": "'.__('Failed to upload extension').'",
+                };
+                var url = "'.ui_get_full_url('ajax.php', false, false, false).'";
+            </script>';
+        ui_require_javascript_file('manage_extensions');
+        try {
+            $columns = [
+                'name',
+                'short_name',
+                'section',
+                'description',
+                'version',
+                [
+                    'text'  => 'actions',
+                    'class' => 'flex flex-items-center',
+                ],
+            ];
+
+            $columnNames = [
+                __('Name'),
+                __('Short name'),
+                __('Section'),
+                __('Description'),
+                __('Version'),
+                __('Actions'),
+            ];
+
+            // Load datatables user interface.
+            ui_print_datatable(
+                [
+                    'id'                  => 'list_extensions',
+                    'class'               => 'info_table',
+                    'style'               => 'width: 99%',
+                    'dom_elements'        => 'plfti',
+                    'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar',
+                    'columns'             => $columns,
+                    'column_names'        => $columnNames,
+                    'ajax_url'            => $this->ajaxController,
+                    'ajax_data'           => ['method' => 'getExtensionsInstalled'],
+                    'no_sortable_columns' => [-1],
+                    'order'               => [
+                        'field'     => 'name',
+                        'direction' => 'asc',
+                    ],
+                    'search_button_class' => 'sub filter float-right',
+                ]
+            );
+        } catch (Exception $e) {
+            echo $e->getMessage();
+        }
+
+    }
+
+
+    /**
+     * Upload extension to server.
+     *
+     * @param array $disco File disco tu upload.
+     *
+     * @return boolean $result Of operation, true if is ok.
+     */
+    private function uploadExtension($disco)
+    {
+        global $config;
+        if (substr($disco['name'], -6) !== '.disco') {
+            return false;
+        }
+
+        $nameFile = str_replace('.disco', '.zip', $disco['name']);
+        $nameTempDir = $config['attachment_store'].'/downloads/';
+        if (file_exists($nameTempDir) === false) {
+            mkdir($nameTempDir);
+        }
+
+        $tmpPath = Files::tempdirnam(
+            $nameTempDir,
+            'extensions_uploaded_'
+        );
+        $result = move_uploaded_file($disco['tmp_name'], $tmpPath.'/'.$nameFile);
+        if ($result === true) {
+            $unzip = $this->unZip($tmpPath.'/'.$nameFile, $tmpPath);
+            if ($unzip === true) {
+                unlink($tmpPath.'/'.$nameFile);
+                db_process_sql_begin();
+                $this->iniFile = parse_ini_file($tmpPath.'/discovery_definition.ini', true, INI_SCANNER_TYPED);
+                if ($this->iniFile === false) {
+                    db_process_sql_rollback();
+                    Files::rmrf($tmpPath);
+                    return __('Failed to upload extension: Error while parsing dicovery_definition.ini');
+                }
+
+                $error = ExtensionsDiscovery::validateIni($this->iniFile);
+                if ($error !== false) {
+                    db_process_sql_rollback();
+                    Files::rmrf($tmpPath);
+                    return $error;
+                }
+
+                $id = $this->installExtension();
+                if ($id === false) {
+                    db_process_sql_rollback();
+                    Files::rmrf($tmpPath);
+                    return false;
+                }
+
+                $result = $this->autoLoadConfigExec($id);
+                if ($result === false) {
+                    db_process_sql_rollback();
+                    Files::rmrf($tmpPath);
+                    return false;
+                }
+
+                $result = $this->autoUpdateDefaultMacros($id);
+                if ($result === false) {
+                    db_process_sql_rollback();
+                    Files::rmrf($tmpPath);
+                    return false;
+                }
+
+                $nameFolder = $this->iniFile['discovery_extension_definition']['short_name'];
+                $installationFolder = $config['homedir'].'/'.$this->path.'/'.$nameFolder;
+                if (file_exists($installationFolder) === false) {
+                    mkdir($installationFolder, 0777, true);
+                } else {
+                    Files::rmrf($installationFolder, true);
+                }
+
+                $result = Files::move($tmpPath, $installationFolder, true);
+                if ($result === false) {
+                    db_process_sql_rollback();
+                    Files::rmrf($tmpPath);
+                    return false;
+                }
+
+                $this->setPermissionfiles($installationFolder, $this->iniFile['discovery_extension_definition']['execution_file']);
+                $this->setPermissionfiles(
+                    $installationFolder,
+                    [
+                        $this->iniFile['discovery_extension_definition']['passencrypt_script'],
+                        $this->iniFile['discovery_extension_definition']['passdecrypt_script'],
+                    ]
+                );
+
+                $result = $this->copyExtensionToServer($installationFolder, $nameFolder);
+                if ($result === false) {
+                    db_process_sql_rollback();
+                    Files::rmrf($tmpPath);
+                    return false;
+                }
+
+                Files::rmrf($tmpPath);
+                db_process_sql_commit();
+                return true;
+            }
+        } else {
+            Files::rmrf($tmpPath);
+            return false;
+        }
+    }
+
+
+    /**
+     * Copy the extension folder into remote path server.
+     *
+     * @param string $path       Path extension folder.
+     * @param string $nameFolder Name of extension folder.
+     *
+     * @return boolean Result of operation.
+     */
+    public function copyExtensionToServer($path, $nameFolder)
+    {
+        global $config;
+        $filesToExclude = [
+            'discovery_definition.ini',
+            'logo.png',
+        ];
+        $serverPath = $config['remote_config'].'/discovery/'.$nameFolder;
+        if (file_exists($serverPath) === false) {
+            mkdir($serverPath, 0777, true);
+        } else {
+            Files::rmrf($serverPath, true);
+        }
+
+        $result = $this->copyFolder($path, $serverPath, $filesToExclude);
+        $this->setPermissionfiles($serverPath, $this->iniFile['discovery_extension_definition']['execution_file']);
+
+        return $result;
+    }
+
+
+    /**
+     * Copy from $source path to $destination
+     *
+     * @param string $source      Initial folder path.
+     * @param string $destination Destination folder path.
+     * @param array  $exclude     Files to exlcude in copy.
+     *
+     * @return boolean Result of operation.
+     */
+    public function copyFolder($source, $destination, $exclude=[])
+    {
+        if (file_exists($destination) === false) {
+            mkdir($destination, 0777, true);
+        }
+
+        $files = scandir($source);
+        foreach ($files as $file) {
+            if ($file !== '.' && $file !== '..') {
+                if (is_dir($source.'/'.$file)) {
+                    $result = $this->copyFolder($source.'/'.$file, $destination.'/'.$file);
+                    if ($result === false) {
+                        return false;
+                    }
+                } else {
+                    if (in_array($file, $exclude) === false) {
+                        $result = copy($source.'/'.$file, $destination.'/'.$file);
+                        if ($result === false) {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Delete extension from database and delete folder
+     *
+     * @param integer $shortName Short name app for delete.
+     *
+     * @return boolean Result of operation.
+     */
+    private function uninstallExtension($shortName)
+    {
+        global $config;
+
+        $result = db_process_sql_delete(
+            'tdiscovery_apps',
+            ['short_name' => $shortName]
+        );
+
+        if ($result !== false) {
+            Files::rmrf($config['homedir'].'/'.$this->path.'/'.$shortName);
+            Files::rmrf($config['remote_config'].'/discovery/'.$shortName);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * Load the basic information of the app into database.
+     *
+     * @return boolean Result of query.
+     */
+    private function installExtension()
+    {
+        $exist = db_get_row_filter(
+            'tdiscovery_apps',
+            [
+                'short_name' => $this->iniFile['discovery_extension_definition']['short_name'],
+            ]
+        );
+        $version = $this->iniFile['discovery_extension_definition']['version'];
+        if ($version === null) {
+            $version = '';
+        }
+
+        $description = $this->iniFile['discovery_extension_definition']['description'];
+        if ($description === null) {
+            $description = '';
+        }
+
+        if ($exist === false) {
+            return db_process_sql_insert(
+                'tdiscovery_apps',
+                [
+                    'short_name'  => $this->iniFile['discovery_extension_definition']['short_name'],
+                    'name'        => io_safe_input($this->iniFile['discovery_extension_definition']['name']),
+                    'description' => io_safe_input($description),
+                    'section'     => $this->iniFile['discovery_extension_definition']['section'],
+                    'version'     => $version,
+                ]
+            );
+        } else {
+            $result = db_process_sql_update(
+                'tdiscovery_apps',
+                [
+                    'name'        => io_safe_input($this->iniFile['discovery_extension_definition']['name']),
+                    'description' => io_safe_input($description),
+                    'section'     => $this->iniFile['discovery_extension_definition']['section'],
+                    'version'     => $version,
+                ],
+                [
+                    'short_name' => $this->iniFile['discovery_extension_definition']['short_name'],
+                ]
+            );
+
+            if ($result !== false) {
+                return $exist['id_app'];
+            }
+        }
+    }
+
+
+    /**
+     * Return all extension installed by ajax.
+     *
+     * @return void
+     */
+    public function getExtensionsInstalled()
+    {
+        global $config;
+
+        $data = [];
+        $start  = get_parameter('start', 0);
+        $length = get_parameter('length', $config['block_size']);
+        $orderDatatable = get_datatable_order(true);
+        $pagination = '';
+        $order = '';
+
+        try {
+            ob_start();
+
+            if (isset($orderDatatable)) {
+                $order = sprintf(
+                    ' ORDER BY %s %s',
+                    $orderDatatable['field'],
+                    $orderDatatable['direction']
+                );
+            }
+
+            if (isset($length) && $length > 0
+                && isset($start) && $start >= 0
+            ) {
+                $pagination = sprintf(
+                    ' LIMIT %d OFFSET %d ',
+                    $length,
+                    $start
+                );
+            }
+
+            $sql = sprintf(
+                'SELECT short_name, name, section, description, version
+                FROM tdiscovery_apps
+                %s %s',
+                $order,
+                $pagination
+            );
+
+            $data = db_get_all_rows_sql($sql);
+
+            $sqlCount = sprintf(
+                'SELECT short_name, name, section, description, version
+                FROM tdiscovery_apps
+                %s',
+                $order,
+            );
+
+            $count = db_get_num_rows($sqlCount);
+
+            foreach ($data as $key => $row) {
+                $logo = $this->path.'/'.$row['short_name'].'/logo.png';
+                if (file_exists($logo) === false) {
+                    $logo = $this->defaultLogo;
+                }
+
+                $logo = html_print_image($logo, true, ['style' => 'max-width: 30px; margin-right: 15px;']);
+                $data[$key]['name'] = $logo.io_safe_output($row['name']);
+                $data[$key]['short_name'] = $row['short_name'];
+                $data[$key]['description'] = io_safe_output($row['description']);
+                $data[$key]['version'] = $row['version'];
+                $data[$key]['actions'] = '<form name="grupo" method="post" class="rowPair table_action_buttons" action="'.$this->url.'&action=delete">';
+                $data[$key]['actions'] .= html_print_input_image(
+                    'button_delete',
+                    'images/delete.svg',
+                    '',
+                    '',
+                    true,
+                    [
+                        'onclick' => 'if (!confirm(\''.__('Deleting this application will also delete all the discovery tasks using it. Do you want to delete it?').'\')) return false;',
+                        'class'   => 'main_menu_icon invert_filter action_button_hidden',
+                    ]
+                );
+                $data[$key]['actions'] .= html_print_input_hidden('short_name', $row['short_name'], true);
+                $data[$key]['actions'] .= '</form>';
+                if ($this->checkFolderConsole($row['short_name']) === true) {
+                    $data[$key]['actions'] .= '<form name="grupo" method="post" class="rowPair table_action_buttons" action="'.$this->url.'&action=sync_server">';
+                    $data[$key]['actions'] .= html_print_input_image(
+                        'button_refresh',
+                        'images/refresh@svg.svg',
+                        '',
+                        '',
+                        true,
+                        [
+                            'onclick' => 'if (!confirm(\''.__('Are you sure you want to reapply?').'\')) return false;',
+                            'class'   => 'main_menu_icon invert_filter action_button_hidden',
+                        ]
+                    );
+                    $data[$key]['actions'] .= html_print_input_hidden('sync_action', 'refresh', true);
+                    $data[$key]['actions'] .= html_print_input_hidden('short_name', $row['short_name'], true);
+                    $data[$key]['actions'] .= '</form>';
+                } else {
+                    $data[$key]['actions'] .= html_print_image(
+                        'images/error_red.png',
+                        true,
+                        [
+                            'title' => __('The extension directory or .ini does not exist in console.'),
+                            'alt'   => __('The extension directory or .ini does not exist in console.'),
+                            'class' => 'main_menu_icon invert_filter',
+                        ],
+                    );
+                }
+            }
+
+            if (empty($data) === true) {
+                $total = 0;
+                $data = [];
+            } else {
+                $total = $count;
+            }
+
+            echo json_encode(
+                [
+                    'data'            => $data,
+                    'recordsTotal'    => $total,
+                    'recordsFiltered' => $total,
+                ]
+            );
+            // Capture output.
+            $response = ob_get_clean();
+        } catch (Exception $e) {
+            echo json_encode(['error' => $e->getMessage()]);
+            exit;
+        }
+
+        json_decode($response);
+        if (json_last_error() === JSON_ERROR_NONE) {
+            echo $response;
+        } else {
+            echo json_encode(
+                [
+                    'success' => false,
+                    'error'   => $response,
+                ]
+            );
+        }
+
+        exit;
+    }
+
+
+    /**
+     * Insert new the default values for extension.
+     *
+     * @param integer $id Id of extension.
+     *
+     * @return boolean Result of query.
+     */
+    private function autoUpdateDefaultMacros($id)
+    {
+        $defaultValues = $this->iniFile['discovery_extension_definition']['default_value'];
+
+        foreach ($defaultValues as $macro => $value) {
+            $sql = 'INSERT IGNORE INTO `tdiscovery_apps_tasks_macros`
+                    (`id_task`, `macro`, `type`, `value`, `temp_conf`)
+                    SELECT `id_rt`, "'.$macro.'", "custom", "'.(string) io_safe_input($value).'", "0"
+                    FROM `trecon_task`
+                    WHERE `id_app` = "'.$id.'";';
+            $result = db_process_sql($sql);
+            if ($result === false) {
+                return false;
+            }
+        }
+
+        $tempFiles = $this->iniFile['tempfile_confs']['file'];
+        foreach ($tempFiles as $macro => $value) {
+            $sql = 'UPDATE `tdiscovery_apps_tasks_macros`
+                    SET `value` = "'.(string) io_safe_input($value).'" WHERE `id_task`
+                    IN (SELECT `id_rt` FROM `trecon_task` WHERE `id_app` = "'.$id.'") AND `macro` = "'.$macro.'"';
+            $result = db_process_sql($sql);
+            if ($result === false) {
+                return false;
+            }
+
+            $sql = 'INSERT IGNORE INTO `tdiscovery_apps_tasks_macros`
+                    (`id_task`, `macro`, `type`, `value`, `temp_conf`)
+                    SELECT `id_rt`, "'.$macro.'", "custom", "'.(string) io_safe_input($value).'", "1"
+                    FROM `trecon_task`
+                    WHERE `id_app` = "'.$id.'";';
+            $result = db_process_sql($sql);
+            if ($result === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Load the exec files in database
+     *
+     * @param integer $id Id of extension.
+     *
+     * @return boolean Result of query.
+     */
+    private function autoLoadConfigExec($id)
+    {
+        $executionFiles = $this->iniFile['discovery_extension_definition']['execution_file'];
+
+        foreach ($executionFiles as $key => $value) {
+            $exist = db_get_row_filter(
+                'tdiscovery_apps_scripts',
+                [
+                    'id_app' => $id,
+                    'macro'  => $key,
+                ]
+            );
+            if ($exist === false) {
+                $result = db_process_sql_insert(
+                    'tdiscovery_apps_scripts',
+                    [
+                        'id_app' => $id,
+                        'macro'  => $key,
+                        'value'  => io_safe_input($value),
+                    ]
+                );
+                if ($result === false) {
+                    return false;
+                }
+            } else {
+                $result = db_process_sql_update(
+                    'tdiscovery_apps_scripts',
+                    ['value' => io_safe_input($value)],
+                    [
+                        'id_app' => $id,
+                        'macro'  => $key,
+                    ]
+                );
+                if ($result === false) {
+                    return false;
+                }
+            }
+        }
+
+        $execCommands = $this->iniFile['discovery_extension_definition']['exec'];
+        $result = db_process_sql_delete(
+            'tdiscovery_apps_executions',
+            ['id_app' => $id]
+        );
+        if ($result === false) {
+            return false;
+        }
+
+        foreach ($execCommands as $key => $value) {
+            $result = db_process_sql_insert(
+                'tdiscovery_apps_executions',
+                [
+                    'id_app'    => $id,
+                    'execution' => io_safe_input($value),
+                ]
+            );
+            if ($result === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Check if exist folder extension in console.
+     *
+     * @param string $shortName Name of folder.
+     *
+     * @return boolean Return true if exist folder
+     */
+    private function checkFolderConsole($shortName)
+    {
+        global $config;
+
+        $folderPath = $config['homedir'].'/'.$this->path.'/'.$shortName;
+        $iniPath = $config['homedir'].'/'.$this->path.'/'.$shortName.'/discovery_definition.ini';
+        if (file_exists($folderPath) === false || file_exists($iniPath) === false) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
+    /**
+     * Validate the ini name by ajax.
+     *
+     * @return void
+     */
+    public function validateIniName()
+    {
+        global $config;
+        $uploadDisco = get_parameter('upload_disco', '');
+        if (empty($uploadDisco) === false) {
+            if ($_FILES['file']['error'] == 0) {
+                $disco = $_FILES['file'];
+            } else {
+                echo json_encode(['success' => false, 'message' => 'Failed to upload extension']);
+                return;
+            }
+        }
+
+        if (substr($disco['name'], -6) !== '.disco') {
+            echo json_encode(['success' => false, 'message' => 'Failed to upload extension']);
+            return;
+        }
+
+        $nameFile = str_replace('.disco', '.zip', $disco['name']);
+        $nameTempDir = $config['attachment_store'].'/downloads/';
+        if (file_exists($nameTempDir) === false) {
+            mkdir($nameTempDir);
+        }
+
+        $tmpPath = Files::tempdirnam(
+            $nameTempDir,
+            'extensions_uploaded_'
+        );
+        $result = move_uploaded_file($disco['tmp_name'], $tmpPath.'/'.$nameFile);
+        if ($result === true) {
+            $unzip = $this->unZip($tmpPath.'/'.$nameFile, $tmpPath, 'discovery_definition.ini');
+            if ($unzip === true) {
+                unlink($tmpPath.'/'.$nameFile);
+                $this->iniFile = parse_ini_file($tmpPath.'/discovery_definition.ini', true, INI_SCANNER_TYPED);
+                if ($this->iniFile === false) {
+                    Files::rmrf($tmpPath);
+                    echo json_encode(['success' => false, 'message' => __('Failed to upload extension: Error while parsing dicovery_definition.ini')]);
+                    return;
+                }
+
+                $message = false;
+                $shortName = $this->iniFile['discovery_extension_definition']['short_name'];
+                if (strpos($shortName, 'pandorafms.') === 0) {
+                    $message = __('The \'short_name\' starting with \'pandorafms.\' is reserved for Pandora FMS applications. If this is not an official Pandora FMS application, consider changing the \'short_name\'. Do you want to continue?');
+                }
+
+                $exist = db_get_row_filter(
+                    'tdiscovery_apps',
+                    ['short_name' => $shortName]
+                );
+
+                if ($exist !== false) {
+                    $message = __('There is another application with the same \'short_name\': \'%s\'. Do you want to overwrite the application and all of its contents?', $shortName);
+                }
+
+                if ($message !== false) {
+                    echo json_encode(
+                        [
+                            'success' => true,
+                            'warning' => true,
+                            'message' => $message,
+                        ]
+                    );
+                } else {
+                    echo json_encode(['success' => true]);
+                }
+
+                Files::rmrf($tmpPath);
+                return;
+            }
+        } else {
+            Files::rmrf($tmpPath);
+            echo json_encode(['success' => false, 'message' => __('Failed to upload extension')]);
+            return;
+        }
+    }
+
+
+    /**
+     * Return all extensions from section.
+     *
+     * @param string $section Section to filter.
+     *
+     * @return array List of sections.
+     */
+    static public function getExtensionBySection($section)
+    {
+        return db_get_all_rows_filter(
+            'tdiscovery_apps',
+            ['section' => $section]
+        );
+    }
+
+
+    /**
+     * Set execution permission in folder items and subfolders.
+     *
+     * @param string $path   Array of files to apply permissions.
+     * @param array  $filter Array of files for apply permission only.
+     *
+     * @return void
+     */
+    private function setPermissionfiles($path, $filter=false)
+    {
+        global $config;
+
+        if ($filter !== false && is_array($filter) === true) {
+            foreach ($filter as $key => $file) {
+                if (substr($file, 0, 1) !== '/') {
+                    $file = $path.'/'.$file;
+                }
+
+                chmod($file, 0777);
+            }
+        } else {
+            chmod($path, 0777);
+
+            if (is_dir($path)) {
+                $items = scandir($path);
+                foreach ($items as $item) {
+                    if ($item != '.' && $item != '..') {
+                        $itemPath = $path.'/'.$item;
+                        $this->setPermissionfiles($itemPath);
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Unzip folder or only file.
+     *
+     * @param string $zipFile     File to unzip.
+     * @param string $target_path Target path into unzip.
+     * @param string $file        If only need unzip one file.
+     *
+     * @return boolean  $result True if the file has been successfully decompressed.
+     */
+    public function unZip($zipFile, $target_path, $file=null)
+    {
+        $zip = new \ZipArchive;
+
+        if ($zip->open($zipFile) === true) {
+            $zip->extractTo($target_path, $file);
+            $zip->close();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+}
diff --git a/pandora_console/images/report-task.svg b/pandora_console/images/report-task.svg
new file mode 100644
index 0000000000..b16b7144da
--- /dev/null
+++ b/pandora_console/images/report-task.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Reportes programados@svg</title>
+    <g id="Reportes-programados" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8.00059781,0 C8.54059781,0 9.00059781,0.363636364 9.00059781,0.909090909 L9.00059781,4.07934284 C9.00059781,5.35207011 9.69059781,6 10.9505978,6 L14.1005978,6 C14.6405978,6 15.0005978,6.45454545 15.0005978,7 L15.0005978,16.3636364 C15.0005978,18.3636364 13.3805978,20 11.4005978,20 L5.24310254,20.0009635 C7.48899044,18.7052484 9.00059781,16.2791516 9.00059781,13.5 C9.00059781,9.35786438 5.64273343,6 1.50059781,6 C0.986687841,6 0.484850221,6.05168787 -2.12052598e-14,6.15014855 L0.000597808993,3.63636364 C0.000597808993,1.63636364 1.62059781,0 3.60059781,0 Z M10.0001439,1 L14.0005978,5 L11.0001439,5 C10.4478591,5 10.0001439,4.55228475 10.0001439,4 L10.0001439,1 Z" id="Shape" fill="#3F3F3F" transform="translate(7.500299, 10.000482) scale(-1, 1) translate(-7.500299, -10.000482) "></path>
+        <path d="M13.5,7 C17.0898509,7 20,9.91014913 20,13.5 C20,17.0898509 17.0898509,20 13.5,20 C9.91014913,20 7,17.0898509 7,13.5 C7,9.91014913 9.91014913,7 13.5,7 Z M14.0002191,9 C13.4873832,9 13.0647119,9.38604019 13.0069468,9.88337887 L13.0002191,10 L13.0002191,13.382 L11.4068856,14.2067645 C10.9481913,14.4361116 10.742785,14.9704208 10.9135349,15.4410874 L10.959672,15.5484052 C11.1890192,16.0070996 11.7233284,16.2125059 12.193995,16.0417559 L12.3013128,15.9956188 L14.4474327,14.8944272 C14.748574,14.7438565 14.9511225,14.4535358 14.9924154,14.1248553 L15.0002191,14 L15.0002191,10 C15.0002191,9.44771525 14.5525038,9 14.0002191,9 Z" id="Oval-2" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/wizard/Configurar_app@svg.svg b/pandora_console/images/wizard/Configurar_app@svg.svg
new file mode 100644
index 0000000000..59507e2cf4
--- /dev/null
+++ b/pandora_console/images/wizard/Configurar_app@svg.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="462px" height="462px" viewBox="0 0 462 462" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Configurar app@svg</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M170.651341,0 L170.651,0.004 L172.111579,0.00817671226 C263.146802,0.548182735 340,27.8694245 340,92.0575424 L340,247.942458 C340,312.77894 261.586371,340 169.348659,340 L170.651,339.996 L170.651341,340 L170,339.998 L169.348659,340 L169.348659,340 L169.348,339.996 L167.888421,339.991823 C128.247423,339.756679 91.2955334,334.44344 62.2073113,323.219366 L161.855602,223.57095 C187.013424,231.95857 215.800358,226.422038 235.828233,206.394148 C254.435585,187.786783 260.775236,161.559784 254.857225,137.762234 C253.732853,133.229606 248.060798,131.693633 244.757955,134.996478 L207.432822,172.321638 L173.360336,166.644559 L167.683262,132.572049 L205.008395,95.2468889 C208.331316,91.9239659 206.73009,86.2619459 202.167348,85.1275341 C178.384873,79.2346161 152.19805,85.5843105 133.610776,104.166578 C113.713408,124.06396 108.237114,152.90613 116.519318,178.053931 L10.1129522,284.45776 C3.58111026,273.936239 0,261.798287 0,247.942458 L0,92.0575424 C0,27.2210597 78.4136287,0 170.651341,0 L169.348,0.004 L169.348659,0 L170,0.002 L170.651341,0 L170.651341,0 Z" id="path-1"></path>
+    </defs>
+    <g id="Configurar-app" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Rectangle" transform="translate(61.000000, 61.000000)">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Mask" stroke="#555555" stroke-width="14" stroke-linejoin="round" xlink:href="#path-1"></use>
+        </g>
+        <g id="Group" transform="translate(107.000000, 136.000000)" stroke="#555555" stroke-width="7">
+            <circle id="Oval" cx="14.5" cy="14.5" r="14.5"></circle>
+            <circle id="Oval-Copy" cx="14.5" cy="61.5" r="14.5"></circle>
+            <circle id="Oval-Copy-2" cx="142.5" cy="208.5" r="14.5"></circle>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/wizard/Custom_apps@svg.svg b/pandora_console/images/wizard/Custom_apps@svg.svg
new file mode 100644
index 0000000000..23e251912d
--- /dev/null
+++ b/pandora_console/images/wizard/Custom_apps@svg.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="462px" height="462px" viewBox="0 0 462 462" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Custom apps@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Custom-apps" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" transform="translate(61.000000, 61.000000)" stroke="#555555">
+            <path d="M0,315.724835 L0,274.275165 C0,257.178072 20.6773253,250 45,250 L45,250 C69.3226747,250 90,257.178072 90,274.275165 L90,315.724835 C90,332.821928 69.3226747,340 45,340 L45,340 C20.6773253,340 0,332.821928 0,315.724835 Z" id="Mask" stroke-width="14" stroke-linejoin="round"></path>
+            <path d="M0,190.724835 L0,149.275165 C0,132.178072 20.6773253,125 45,125 L45,125 C69.3226747,125 90,132.178072 90,149.275165 L90,190.724835 C90,207.821928 69.3226747,215 45,215 L45,215 C20.6773253,215 0,207.821928 0,190.724835 Z" id="Mask-Copy" stroke-width="14" stroke-linejoin="round"></path>
+            <path d="M0,65.7248353 L0,24.2751647 C0,7.17807242 20.6773253,0 45,0 L45,0 C69.3226747,0 90,7.17807242 90,24.2751647 L90,65.7248353 C90,82.8219276 69.3226747,90 45,90 L45,90 C20.6773253,90 0,82.8219276 0,65.7248353 Z" id="Mask-Copy-2" stroke-width="14" stroke-linejoin="round"></path>
+            <path d="M125,315.724835 L125,274.275165 C125,257.178072 145.677325,250 170,250 L170,250 C194.322675,250 215,257.178072 215,274.275165 L215,315.724835 C215,332.821928 194.322675,340 170,340 L170,340 C145.677325,340 125,332.821928 125,315.724835 Z" id="Mask" stroke-width="14" stroke-linejoin="round"></path>
+            <path d="M125,190.724835 L125,149.275165 C125,132.178072 145.677325,125 170,125 L170,125 C194.322675,125 215,132.178072 215,149.275165 L215,190.724835 C215,207.821928 194.322675,215 170,215 L170,215 C145.677325,215 125,207.821928 125,190.724835 Z" id="Mask-Copy" stroke-width="14" stroke-linejoin="round"></path>
+            <path d="M125,65.7248353 L125,24.2751647 C125,7.17807242 145.677325,0 170,0 L170,0 C194.322675,0 215,7.17807242 215,24.2751647 L215,65.7248353 C215,82.8219276 194.322675,90 170,90 L170,90 C145.677325,90 125,82.8219276 125,65.7248353 Z" id="Mask-Copy-2" stroke-width="14" stroke-linejoin="round"></path>
+            <path d="M250,190.724835 L250,149.275165 C250,132.178072 270.677325,125 295,125 L295,125 C319.322675,125 340,132.178072 340,149.275165 L340,190.724835 C340,207.821928 319.322675,215 295,215 L295,215 C270.677325,215 250,207.821928 250,190.724835 Z" id="Mask-Copy" stroke-width="14" stroke-linejoin="round"></path>
+            <path d="M250,65.7248353 L250,24.2751647 C250,7.17807242 270.677325,0 295,0 L295,0 C319.322675,0 340,7.17807242 340,24.2751647 L340,65.7248353 C340,82.8219276 319.322675,90 295,90 L295,90 C270.677325,90 250,82.8219276 250,65.7248353 Z" id="Mask-Copy-2" stroke-width="14" stroke-linejoin="round"></path>
+            <circle id="Oval" stroke-width="7" cx="45" cy="45" r="15"></circle>
+            <polygon id="Polygon" stroke-width="7" points="295 155 309.265848 165.364745 303.816779 182.135255 286.183221 182.135255 280.734152 165.364745"></polygon>
+            <rect id="Rectangle" stroke-width="7" x="155" y="280" width="30" height="30"></rect>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/wizard/app_generico.svg b/pandora_console/images/wizard/app_generico.svg
new file mode 100644
index 0000000000..99d3e5cf42
--- /dev/null
+++ b/pandora_console/images/wizard/app_generico.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="462px" height="462px" viewBox="0 0 462 462" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>App genérico@svg</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M340,247.942458 C340,312.77894 261.586371,340 169.348659,340 L170.651,339.996 L170.651341,340 L170,339.998 L169.348659,340 L169.348659,340 L169.348,339.996 L167.888421,339.991823 C76.8531975,339.451817 0,312.130576 0,247.942458 L0,92.0575424 C0,27.2210597 78.4136287,0 170.651341,0 L169.348,0.004 L169.348659,0 L170,0.002 L170.651341,0 L170.651341,0 L170.651,0.004 L172.111579,0.00817671226 C263.146802,0.548182735 340,27.8694245 340,92.0575424 Z" id="path-1"></path>
+    </defs>
+    <g id="App-genérico" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Rectangle" transform="translate(61.000000, 61.000000)">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Mask" stroke="#555555" stroke-width="14" stroke-linejoin="round" xlink:href="#path-1"></use>
+            <path d="M243.089632,66.6385397 C255.811455,68.1348967 268.474117,71.8213332 276.910371,78.4128805 C279.780827,80.6195335 283.214489,83.0345401 285.04609,85.6744737 C286.108609,87.2039779 287.599447,90.7246786 286.747539,92.8105813 C285.689754,95.3439706 281.820673,95.5831036 278.614186,95.5168093 C267.669538,95.2682057 257.661988,94.0985848 247.077034,95.3534412 C232.071625,97.1623285 219.643237,101.345972 208.921031,105.81847 C186.274482,115.196745 166.808389,130.69067 151.450385,146.338491 C135.966961,162.071549 121.652544,181.903015 110.248812,202.274305 C97.5530192,224.954058 87.9619574,248.876829 80.0344822,274 C62.0000677,250.340039 50.8566406,221.118459 50,189.124358 L50,189.079372 L50,189.079372 C67.1635754,162.156784 86.968065,137.803101 110.459422,117.133486 C126.655136,102.842329 145.730771,90.113824 166.841519,80.8823431 C170.384035,79.3102211 173.820063,77.3284952 177.646549,76.1044183 C181.43044,74.8637679 185.379979,73.6325881 189.417075,72.3019668 C204.850804,67.2470266 226.07514,64.7278433 243.089632,66.6385397 Z M249.443746,111.548575 C251.871655,112.938928 254.490313,115.160583 256.507696,116.816952 C263.206733,122.210025 268.91885,129.801891 273.814061,136.838864 C280.819956,146.997376 286.722822,158.745753 288.862533,171.957223 C294.066675,204.579596 280.685187,228.427576 263.552985,242.99199 C254.774364,250.4841 243.209143,256.901753 230.756521,260.222805 C216.819372,263.942882 201.165478,264.946679 186.253848,262.930771 C158.17014,259.167051 132.95804,241.350168 116,224.649308 C117.944815,220.058442 118.525357,218.38129 120.519932,213.865241 C123.851827,217.348397 129.769207,221.999533 132.402378,223.828397 C150.61895,236.584729 174.427383,247.587012 205.998488,245.822573 C221.986194,244.978802 236.82733,239.450643 247.36209,231.008769 C257.579625,222.849539 266.134322,211.117788 265.976747,194.763997 C265.812951,177.460443 257.372288,163.326228 248.149968,153.85354 C244.990162,150.594836 241.573259,147.109602 238.121109,144.540878 C232.659869,140.477889 226.584914,137.325176 220.476785,134.344958 C214.262915,131.264983 207.879029,128.18293 200.468828,126.561891 C212.714113,118.797529 245.558263,109.318607 249.443746,111.548575 Z" id="Path-3" stroke="#555555" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/wizard/applications.png b/pandora_console/images/wizard/applications.png
new file mode 100644
index 0000000000..01c10178bd
Binary files /dev/null and b/pandora_console/images/wizard/applications.png differ
diff --git a/pandora_console/images/wizard/cloud.png b/pandora_console/images/wizard/cloud.png
new file mode 100644
index 0000000000..a016599e2f
Binary files /dev/null and b/pandora_console/images/wizard/cloud.png differ
diff --git a/pandora_console/images/wizard/consoletasks.png b/pandora_console/images/wizard/consoletasks.png
new file mode 100644
index 0000000000..0087897495
Binary files /dev/null and b/pandora_console/images/wizard/consoletasks.png differ
diff --git a/pandora_console/include/ajax/audit_log.php b/pandora_console/include/ajax/audit_log.php
index c979568b21..026d8ca881 100644
--- a/pandora_console/include/ajax/audit_log.php
+++ b/pandora_console/include/ajax/audit_log.php
@@ -84,7 +84,7 @@ if ($save_log_filter) {
 
 
 if ($recover_aduit_log_select) {
-    echo json_encode(audit_get_audit_filter_select());
+    echo json_encode(audit_get_audit_filter_select_fix_order());
 }
 
 if ($update_log_filter) {
@@ -190,7 +190,7 @@ function show_filter() {
         draggable: true,
         modal: false,
         closeOnEscape: true,
-        width: 380
+        width: "auto"
     });
 }
 
@@ -207,12 +207,13 @@ function load_filter_values() {
         },
         success: function(data) {
             var options = "";
+            console.log(data);
             $.each(data,function(i,value){
                 if (i == 'text'){
                     $("#text-filter_text").val(value);
                 }
                 if (i == 'period'){
-                    $("#text-filter_period").val(value);
+                    $("#filter_period").val(value).change();
                 }
                 if (i == 'ip'){
                     $("#text-filter_ip").val(value);
@@ -395,7 +396,7 @@ function save_new_filter() {
             "save_log_filter" : 1,
             "id_name" : $("#text-id_name").val(),
             "text" : $("#text-filter_text").val(),
-            "period" : $("#text-filter_period").val(),
+            "period" : $("#filter_period :selected").val(),
             "ip" : $('#text-filter_ip').val(),
             "type" : $('#filter_type :selected').val(),
             "user" : $('#filter_user :selected').val(),
@@ -431,7 +432,7 @@ function save_update_filter() {
         "update_log_filter" : 1,
         "id" : $("#overwrite_filter :selected").val(),
         "text" : $("#text-filter_text").val(),
-        "period" : $("#text-filter_period").val(),
+        "period" : $("#filter_period :selected").val(),
         "ip" : $('#text-filter_ip').val(),
         "type" : $('#filter_type :selected').val(),
         "user" : $('#filter_user :selected').val(),
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 666d23d244..571955fd25 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -90,86 +90,38 @@ $get_comments = (bool) get_parameter('get_comments', false);
 $get_events_fired = (bool) get_parameter('get_events_fired');
 $get_id_source_event = get_parameter('get_id_source_event');
 $node_id = (int) get_parameter('node_id', 0);
+$settings_modal = get_parameter('settings', 0);
+$parameters_modal = get_parameter('parameters', 0);
 
 if ($get_comments === true) {
-    $event = get_parameter('event', false);
-    $event_rep = (int) get_parameter_post('event')['event_rep'];
-    $group_rep = (int) get_parameter_post('event')['group_rep'];
+    global $config;
+    $event = json_decode(io_safe_output(base64_decode(get_parameter('event', ''))), true);
+    $filter = json_decode(io_safe_output(base64_decode(get_parameter('filter', ''))), true);
+
+    $default_hour = (int) $filter['event_view_hr'];
+    if (isset($config['max_hours_old_event_comment']) === true
+        && empty($config['max_hours_old_event_comment']) === false
+    ) {
+        $default_hour = (int) $config['max_hours_old_event_comment'];
+    }
+
+    $custom_event_view_hr = (int) get_parameter('custom_event_view_hr', 0);
+    if (empty($custom_event_view_hr) === false) {
+        if ($custom_event_view_hr === -2) {
+            $filter['event_view_hr_cs'] = ($default_hour * 3600);
+        } else {
+            $filter['event_view_hr_cs'] = $custom_event_view_hr;
+        }
+    } else {
+        $filter['event_view_hr_cs'] = ($default_hour * 3600);
+    }
 
     if ($event === false) {
         return __('Failed to retrieve comments');
     }
 
-    $eventsGrouped = [];
-    // Consider if the event is grouped.
-    $whereGrouped = '1=1';
-    if ($group_rep === EVENT_GROUP_REP_EVENTS && $event_rep > 1) {
-        // Default grouped message filtering (evento and estado).
-        $whereGrouped = sprintf(
-            '`evento` = "%s"',
-            $event['evento']
-        );
-
-        // If id_agente is reported, filter the messages by them as well.
-        if ((int) $event['id_agente'] > 0) {
-            $whereGrouped .= sprintf(
-                ' AND `id_agente` = %d',
-                (int) $event['id_agente']
-            );
-        }
-
-        if ((int) $event['id_agentmodule'] > 0) {
-            $whereGrouped .= sprintf(
-                ' AND `id_agentmodule` = %d',
-                (int) $event['id_agentmodule']
-            );
-        }
-    } else if ($group_rep === EVENT_GROUP_REP_EXTRAIDS) {
-        $whereGrouped = sprintf(
-            '`id_extra` = "%s"',
-            io_safe_output($event['id_extra'])
-        );
-    } else {
-        $whereGrouped = sprintf('`id_evento` = %d', $event['id_evento']);
-    }
-
-    try {
-        if (is_metaconsole() === true
-            && $event['server_id'] > 0
-        ) {
-            $node = new Node($event['server_id']);
-            $node->connect();
-        }
-
-        $sql = sprintf(
-            'SELECT `user_comment`
-            FROM tevento
-            WHERE %s',
-            $whereGrouped
-        );
-
-        // Get grouped comments.
-        $eventsGrouped = db_get_all_rows_sql($sql);
-    } catch (\Exception $e) {
-        // Unexistent agent.
-        if (is_metaconsole() === true
-            && $event['server_id'] > 0
-        ) {
-            $node->disconnect();
-        }
-
-        $eventsGrouped = [];
-    } finally {
-        if (is_metaconsole() === true
-            && $event['server_id'] > 0
-        ) {
-            $node->disconnect();
-        }
-    }
-
-    // End of get_comments.
-    echo events_page_comments($event, true, $eventsGrouped);
-
+    $eventsGrouped = event_get_comment($event, $filter);
+    echo events_page_comments($event, $eventsGrouped, $filter);
     return;
 }
 
@@ -562,8 +514,13 @@ if ($load_filter_modal) {
         false
     );
 
+    $action = 'index.php?sec=eventos&sec2=operation/events/events&pure=';
+    if ($settings_modal !== 0 && $parameters_modal !== 0) {
+        $action .= '&settings='.$settings_modal.'&parameters='.$parameters_modal;
+    }
+
     echo '<div id="load-filter-select" class="load-filter-modal">';
-    echo '<form method="post" id="form_load_filter" action="index.php?sec=eventos&sec2=operation/events/events&pure=">';
+    echo '<form method="post" id="form_load_filter" action="'.$action.'">';
 
     $table = new StdClass;
     $table->id = 'load_filter_form';
@@ -1003,7 +960,7 @@ function save_new_filter() {
             }
             else {
                 id_filter_save = data;
-                
+
                 $("#info_box").filter(function(i, item) {
                     if ($(item).data('type_info_box') == "success_create_filter") {
                         return true;
@@ -2003,23 +1960,7 @@ if ($get_extended_event) {
 
     $js .= '});';
 
-    $js .= '
-        $("#link_comments").click(function (){
-          $.post ({
-                url : "ajax.php",
-                data : {
-                    page: "include/ajax/events",
-                    get_comments: 1,
-                    event: '.json_encode($event).',
-                    event_rep: '.$event_rep.'
-                },
-                dataType : "html",
-                success: function (data) {
-                    $("#extended_event_comments_page").empty();
-                    $("#extended_event_comments_page").html(data);
-                }
-            });
-        });';
+    $js .= '$("#link_comments").click(get_table_events_tabs(\''.base64_encode(json_encode($event)).'\',\''.base64_encode(json_encode($filter)).'\'));';
 
     if (events_has_extended_info($event['id_evento']) === true) {
         $js .= '
@@ -2525,7 +2466,7 @@ if ($drawConsoleSound === true) {
                     'label'      => __('Start'),
                     'type'       => 'button',
                     'name'       => 'start-search',
-                    'attributes' => [ 'class' => 'play' ],
+                    'attributes' => [ 'class' => 'play secondary' ],
                     'return'     => true,
                 ],
                 'div',
@@ -2651,23 +2592,24 @@ if ($get_events_fired) {
             $return[] = array_merge(
                 $event,
                 [
-                    'fired'     => $event['id_evento'],
-                    'message'   => ui_print_string_substr(
+                    'fired'           => $event['id_evento'],
+                    'message'         => ui_print_string_substr(
                         strip_tags(io_safe_output($event['evento'])),
                         75,
                         true,
                         '9'
                     ),
-                    'priority'  => ui_print_event_priority($event['criticity'], true, true),
-                    'type'      => events_print_type_img(
+                    'priority'        => ui_print_event_priority($event['criticity'], true, true),
+                    'type'            => events_print_type_img(
                         $event['event_type'],
                         true
                     ),
-                    'timestamp' => ui_print_timestamp(
+                    'timestamp'       => ui_print_timestamp(
                         $event['timestamp'],
                         true,
                         ['style' => 'font-size: 9pt; letter-spacing: 0.3pt;']
                     ),
+                    'event_timestamp' => $event['timestamp'],
                 ]
             );
         }
diff --git a/pandora_console/include/ajax/manage_extensions.ajax.php b/pandora_console/include/ajax/manage_extensions.ajax.php
new file mode 100644
index 0000000000..b116277a23
--- /dev/null
+++ b/pandora_console/include/ajax/manage_extensions.ajax.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Manager extensions ajax
+ *
+ * @category   Ajax library.
+ * @package    Pandora FMS
+ * @subpackage Modules.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 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 for 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.
+ * ============================================================================
+ */
+
+// Begin.
+global $config;
+
+require_once $config['homedir'].'/godmode/wizards/ManageExtensions.class.php';
+if (is_ajax() === false) {
+    exit;
+}
+
+// Control call flow.
+try {
+    // User access and validation is being processed on class constructor.
+    $actions = new ManageExtensions();
+} catch (Exception $e) {
+    exit;
+}
+
+// Ajax controller.
+$method = get_parameter('method', '');
+
+if (method_exists($actions, $method) === true) {
+    if ($actions->ajaxMethod($method) === true) {
+        $actions->{$method}();
+    } else {
+        $actions->errorAjax('Unavailable method.');
+    }
+} else {
+    $actions->errorAjax('Method not found. ['.$method.']');
+}
+
+
+// Stop any execution.
+exit;
diff --git a/pandora_console/include/class/AuditLog.class.php b/pandora_console/include/class/AuditLog.class.php
index 98bca38e43..f35f4e4e6d 100644
--- a/pandora_console/include/class/AuditLog.class.php
+++ b/pandora_console/include/class/AuditLog.class.php
@@ -178,7 +178,7 @@ class AuditLog extends HTML
                 [
                     'id'                  => $this->tableId,
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => $this->ajaxController,
@@ -469,7 +469,7 @@ class AuditLog extends HTML
                             success: function(data) {
                                 var options = "";
                                 $.each(data,function(key,value){
-                                    options += "<option value='"+key+"'>"+value+"</option>";
+                                    options += "<option value='"+value+"'>"+key+"</option>";
                                 });
                                 $('#overwrite_filter').html(options);
                                 $('#overwrite_filter').select2();
@@ -509,8 +509,12 @@ class AuditLog extends HTML
                 /* Filter management */
                 $('#button-load-filter').click(function (){
                     if($('#load-filter-select').length) {
-                        $('#load-filter-select').dialog({width: "20%",
-                            maxWidth: "25%",
+                        $('#load-filter-select').dialog({
+                            resizable: true,
+                            draggable: true,
+                            modal: false,
+                            closeOnEscape: true,
+                            width: "auto",
                             title: "<?php echo __('Load filter'); ?>"
                         });
                         $.ajax({
@@ -523,8 +527,9 @@ class AuditLog extends HTML
                             },
                             success: function(data) {
                                 var options = "";
+                                console.log(data)
                                 $.each(data,function(key,value){
-                                    options += "<option value='"+key+"'>"+value+"</option>";
+                                    options += "<option value='"+value+"'>"+key+"</option>";
                                 });
                                 $('#filter_id').html(options);
                                 $('#filter_id').select2();
diff --git a/pandora_console/include/class/CalendarManager.class.php b/pandora_console/include/class/CalendarManager.class.php
index ba1761d6f9..311559c4e2 100644
--- a/pandora_console/include/class/CalendarManager.class.php
+++ b/pandora_console/include/class/CalendarManager.class.php
@@ -1040,7 +1040,7 @@ class CalendarManager
                     'id'                  => 'templates_alerts_special_days',
                     'return'              => true,
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => 'godmode/alerts/alert_special_days',
diff --git a/pandora_console/include/class/ConfigPEN.class.php b/pandora_console/include/class/ConfigPEN.class.php
index 2177e73a74..cea6123f08 100644
--- a/pandora_console/include/class/ConfigPEN.class.php
+++ b/pandora_console/include/class/ConfigPEN.class.php
@@ -612,7 +612,7 @@ class ConfigPEN extends HTML
                     'id'                  => $tableId,
                     'return'              => true,
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => $this->ajaxController,
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index 9142f9a692..12ed8e56be 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -595,7 +595,6 @@ class ConsoleSupervisor
             'days_delete_unknown'              => 'Max. days before unknown modules are deleted',
             'days_delete_not_initialized'      => 'Max. days before delete not initialized modules',
             'days_autodisable_deletion'        => 'Max. days before autodisabled agents are deleted',
-            'delete_old_network_matrix'        => 'Max. days before delete old network matrix data',
             'report_limit'                     => 'Item limit for real-time reports',
             'event_view_hr'                    => 'Default hours for event view',
             'big_operation_step_datos_purge'   => 'Big Operation Step to purge old data',
diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php
index b82a129cd1..937f505f8d 100644
--- a/pandora_console/include/class/CredentialStore.class.php
+++ b/pandora_console/include/class/CredentialStore.class.php
@@ -827,7 +827,7 @@ class CredentialStore extends Wizard
                 [
                     'id'                  => $this->tableId,
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => $this->ajaxController,
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index 7483cbca30..2c00a6b328 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -1579,7 +1579,7 @@ class Diagnostics extends Wizard
                         [
                             'id'                  => $tableId,
                             'class'               => 'info_table caption_table',
-                            'style'               => 'width: 99%',
+                            'style'               => 'width: 100%',
                             'columns'             => $columns,
                             'column_names'        => $columnNames,
                             'ajax_data'           => [
@@ -1591,6 +1591,7 @@ class Diagnostics extends Wizard
                             'no_sortable_columns' => [-1],
                             'caption'             => $title,
                             'print'               => true,
+                            'mini_csv'            => true,
                         ]
                     );
                 } else {
diff --git a/pandora_console/include/class/EventSound.class.php b/pandora_console/include/class/EventSound.class.php
index e485ac4dfb..5658b44324 100644
--- a/pandora_console/include/class/EventSound.class.php
+++ b/pandora_console/include/class/EventSound.class.php
@@ -320,7 +320,7 @@ class EventSound extends HTML
                     [
                         'id'                  => $this->tableId,
                         'class'               => 'info_table',
-                        'style'               => 'width: 99%',
+                        'style'               => 'width: 100%',
                         'columns'             => $columns,
                         'column_names'        => $column_names,
                         'ajax_url'            => $this->ajaxController,
diff --git a/pandora_console/include/class/ExtensionsDiscovery.class.php b/pandora_console/include/class/ExtensionsDiscovery.class.php
new file mode 100644
index 0000000000..da26fb1780
--- /dev/null
+++ b/pandora_console/include/class/ExtensionsDiscovery.class.php
@@ -0,0 +1,2555 @@
+<?php
+/**
+ * Manage ExtensionsDiscovery wizard for Pandora FMS Discovery
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage ExtensionsDiscovery
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-2023 Artica Soluciones Tecnologicas, http://www.artica.es
+ * This code is NOT free software. This code is NOT licenced under GPL2 licence
+ * You cannnot redistribute it without written permission of copyright holder.
+ * ============================================================================
+ */
+
+use PandoraFMS\Tools\Files;
+
+require_once $config['homedir'].'/godmode/wizards/Wizard.main.php';
+/**
+ * Implements extensionsDiscovery in wizard.
+ */
+class ExtensionsDiscovery extends Wizard
+{
+
+    /**
+     * Id from extension
+     *
+     * @var integer
+     */
+    public $id;
+
+    /**
+     * Name from extension
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Description from extension
+     *
+     * @var string
+     */
+    public $description;
+
+    /**
+     * Path from extensions Discovery
+     *
+     * @var string
+     */
+    public $path = '/attachment/discovery';
+
+    /**
+     * Icon from extensions Discovery
+     *
+     * @var string
+     */
+    public $icon = 'logo.png';
+
+    /**
+     * Section Discovery
+     *
+     * @var string
+     */
+    public $section = 'custom';
+
+    /**
+     * Extension to load
+     *
+     * @var string
+     */
+    public $mode = null;
+
+    /**
+     * Last page for steps.
+     *
+     * @var integer
+     */
+    public $lastPage;
+
+    /**
+     * Url page
+     *
+     * @var string
+     */
+    public $url;
+
+    /**
+     * All information from ini file extension.
+     *
+     * @var array
+     */
+    public $iniFile;
+
+    /**
+     * Current page
+     *
+     * @var integer
+     */
+    public $currentPage;
+
+    /**
+     * Values of macros in database.
+     *
+     * @var array
+     */
+    public $macrosValues = false;
+
+    /**
+     * Id from task
+     *
+     * @var integer
+     */
+    public $idTask;
+
+    /**
+     * Name of fields for send.
+     *
+     * @var array
+     */
+    public $nameFields;
+
+    /**
+     * List of select data custom of pandora
+     *
+     * @var array
+     */
+    public $pandoraSelectData = [
+        'agent_groups',
+        'agents',
+        'module_groups',
+        'modules',
+        'module_types',
+        'status',
+        'alert_templates',
+        'alert_actions',
+        'interval',
+        'tags',
+        'credentials.custom',
+        'credentials.aws',
+        'credentials.azure',
+        'credentials.sap',
+        'credentials.snmp',
+        'credentials.gcp',
+        'credentials.wmi',
+        'os',
+    ];
+
+    /**
+     * Default logo for extension.
+     *
+     * @var string
+     */
+    public $defaultLogo = '/images/wizard/app_generico.svg';
+
+
+    /**
+     * Constructor.
+     *
+     * @param string $_section In discovery.
+     * @param string $_mode    Extension to load.
+     *
+     * @return mixed
+     */
+    public function __construct($_section='custom', $_mode=null)
+    {
+        $this->section = $_section;
+        $this->mode = $_mode;
+        $this->url = 'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz='.$_section;
+        $this->loadConfig();
+    }
+
+
+    /**
+     * Load config from extension.
+     *
+     * @return void
+     */
+    private function loadConfig()
+    {
+        $row = db_get_row('tdiscovery_apps', 'short_name', $this->mode);
+        $this->id = $row['id_app'];
+        $this->name = $row['name'];
+        $this->description = $row['description'];
+    }
+
+
+    /**
+     * Return array extensions filtered by section
+     *
+     * @return array Extensions for
+     */
+    public function loadExtensions()
+    {
+        global $config;
+        // Check access.
+        check_login();
+        $extensions = [];
+        $rows = $this->getExtensionsApps();
+        foreach ($rows as $key => $extension) {
+            $logo = $this->path.'/'.$extension['short_name'].'/'.$this->icon;
+            if (file_exists($config['homedir'].$logo) === false) {
+                $logo = $this->defaultLogo;
+            }
+
+            $extensions[] = [
+                'icon'  => $logo,
+                'label' => $extension['name'],
+                'url'   => ui_get_full_url(
+                    'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz='.$this->section.'&mode='.$extension['short_name']
+                ),
+            ];
+        }
+
+        return $extensions;
+    }
+
+
+    /**
+     * Return all extensions from apps section
+     *
+     * @return array extensions.
+     */
+    public function getExtensionsApps()
+    {
+        return db_get_all_rows_filter('tdiscovery_apps', ['section' => $this->section]);
+
+    }
+
+
+    /**
+     * Load the extension information from discovery_definition.ini.
+     *
+     * @return array Information ini file.
+     */
+    public function loadIni()
+    {
+        global $config;
+        $iniFile = parse_ini_file($config['homedir'].$this->path.'/'.$this->mode.'/discovery_definition.ini', true, INI_SCANNER_TYPED);
+
+        return $iniFile;
+    }
+
+
+    /**
+     * Return next page from config_steps.
+     *
+     * @return integer Return the number of next page.
+     */
+    public function nextPage()
+    {
+        $pages = array_keys($this->iniFile['config_steps']['name']);
+        if ($this->currentPage === 0 || empty($this->currentPage) === true) {
+            return $pages[0];
+        }
+
+        foreach ($pages as $k => $page) {
+            if ($page === $this->currentPage) {
+                if (end($pages) === $this->currentPage) {
+                    return $this->currentPage;
+                } else {
+                    return $pages[($k + 1)];
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Draw the extension forms.
+     *
+     * @return boolean Return boolean if exist error.
+     */
+    public function run()
+    {
+        ui_require_javascript_file('extensions_discovery');
+        $_iniFile = $this->loadIni();
+        if ($_iniFile === false) {
+            include 'general/noaccess.php';
+            return false;
+        }
+
+        $this->iniFile = $_iniFile;
+        if (empty($this->iniFile['config_steps']) === false) {
+            $this->lastPage = end(array_keys($this->iniFile['config_steps']['name']));
+        } else {
+            $this->lastPage = 0;
+        }
+
+        $this->currentPage = (int) get_parameter('page', '0');
+        $this->idTask = get_parameter('id_task', '');
+        $action = get_parameter('action', '');
+        $isTheEnd = get_parameter('complete_button', '');
+
+        // Control parameters and errors.
+        $error = false;
+
+        if ($action === 'task_definition_form') {
+            $error = $this->processTaskDefinition();
+        }
+
+        if ($action === 'process_macro') {
+            $error = $this->processCustomMacro();
+        }
+
+        $task = $this->getTask();
+
+        if ($task === false && $this->currentPage > 0) {
+            $error = __('Task not defined');
+        }
+
+        // Build breadcrum.
+        $breadcrum = [
+            [
+                'link'  => 'index.php?sec=gservers&sec2=godmode/servers/discovery',
+                'label' => 'Discovery',
+            ],
+        ];
+
+        switch ($this->section) {
+            case 'app':
+                $breadcrum[] = [
+                    'link'  => $this->url,
+                    'label' => __('Application'),
+                ];
+            break;
+
+            case 'cloud':
+                $breadcrum[] = [
+                    'link'  => $this->url,
+                    'label' => __('Cloud'),
+                ];
+            break;
+
+            case 'custom':
+                $breadcrum[] = [
+                    'link'  => $this->url,
+                    'label' => __('Custom'),
+                ];
+            break;
+
+            default:
+                $breadcrum[] = [
+                    'link'  => $this->url,
+                    'label' => __('Custom'),
+                ];
+            break;
+        }
+
+        $parameters = '';
+        if (empty($this->idTask) === false) {
+            $parameters .= '&id_task='.$this->idTask;
+        }
+
+        $breadcrum[] = [
+            'link'     => $this->url.'&mode='.$this->mode.$parameters,
+            'label'    => 'Task definition',
+            'selected' => ((0 === (int) $this->currentPage) ? 1 : 0),
+        ];
+
+        foreach ($this->iniFile['config_steps']['name'] as $key => $step) {
+            $parameters = '&mode='.$this->mode.'&page='.$key;
+            if (empty($this->idTask) === false) {
+                $parameters .= '&id_task='.$this->idTask;
+            }
+
+            $breadcrum[] = [
+                'link'     => $this->url.$parameters,
+                'label'    => $step,
+                'selected' => (($key === (int) $this->currentPage) ? 1 : 0),
+            ];
+        }
+
+        // Avoid to print header out of wizard.
+        $this->prepareBreadcrum($breadcrum);
+
+        // Header.
+        ui_print_page_header(
+            $this->iniFile['discovery_extension_definition']['name'],
+            '',
+            false,
+            '',
+            true,
+            '',
+            false,
+            '',
+            GENERIC_SIZE_TEXT,
+            '',
+            $this->printHeader(true)
+        );
+
+        if ($error !== false) {
+            ui_print_error_message(
+                $error
+            );
+            return;
+        } else if ($action !== '') {
+            ui_print_success_message(__('Operation realized'));
+
+            if (empty($isTheEnd) === false) {
+                header('Location:'.$config['homeurl'].'index.php?sec=discovery&sec2=godmode/servers/discovery&wiz=tasklist');
+            }
+        }
+
+        $_url = ui_get_full_url(
+            sprintf(
+                $this->url.'&mode=%s&page=%s%s',
+                $this->mode,
+                $this->nextPage(),
+                (empty($this->idTask) === false) ? '&id_task='.$this->idTask : '',
+            )
+        );
+
+        $table = new StdClass();
+        $table->id = 'form_editor';
+        $table->width = '100%';
+        $table->class = 'databox filter-table-adv max_floating_element_size';
+
+        $table->style = [];
+        $table->style[0] = 'width: 50%';
+        $table->style[1] = 'width: 50%';
+        $table->data = [];
+        if ($this->currentPage === 0) {
+            // If page is 0 then create form for task definition.
+            $table->data = $this->viewTaskDefinition();
+        } else {
+            // If page is bigger than 0 then render form .ini.
+            $table->data = $this->viewMacroForm();
+        }
+
+        echo '<form type="submit" action="'.$_url.'" method="post">';
+        html_print_table($table);
+
+        $actionButtons = '';
+
+        if ($this->currentPage !== $this->nextPage()) {
+            $actionButtons = html_print_submit_button(
+                __('Next'),
+                'next_button',
+                false,
+                [
+                    'class' => 'sub',
+                    'icon'  => 'plus',
+                ],
+                true
+            );
+        }
+
+        $actionButtons .= html_print_submit_button(
+            __('Complete setup'),
+            'complete_button',
+            false,
+            [
+                'class' => 'sub',
+                'icon'  => 'update',
+                'value' => '1',
+            ],
+            true
+        );
+
+        html_print_action_buttons($actionButtons);
+        echo '</form>';
+
+    }
+
+
+    /**
+     * Draw a select with the pandora data
+     *
+     * @param string  $selectData   Type of select.
+     * @param string  $name         Name of select.
+     * @param string  $defaultValue Default value.
+     * @param boolean $multiple     Define if the select is multiple.
+     * @param boolean $required     Define if field is required.
+     *
+     * @return string Return the html select.
+     */
+    private function drawSelectPandora($selectData, $name, $defaultValue, $multiple=false, $required=false)
+    {
+        if ($multiple === true && $selectData !== 'interval') {
+            $name .= '[]';
+            $defaultValue = json_decode($defaultValue);
+        } else {
+            $defaultValue = io_safe_input($defaultValue);
+        }
+
+        switch ($selectData) {
+            case 'agent_groups':
+                $input = html_print_select_groups(
+                    false,
+                    'AR',
+                    true,
+                    $name,
+                    $defaultValue,
+                    '',
+                    '',
+                    '',
+                    true,
+                    $multiple,
+                    false,
+                    '',
+                    false,
+                    false,
+                    false,
+                    false,
+                    'id_grupo',
+                    true,
+                    false,
+                    false,
+                    false,
+                    false,
+                    $required
+                );
+            break;
+
+            case 'agents':
+                $input = html_print_select_from_sql(
+                    'SELECT nombre, alias as n FROM tagente',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%;',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'module_groups':
+                $input = html_print_select_from_sql(
+                    'SELECT id_mg, name
+                    FROM tmodule_group ORDER BY name',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'modules':
+                $input = html_print_select_from_sql(
+                    'select nombre, nombre as n from tagente_modulo',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'module_types':
+                $input = html_print_select_from_sql(
+                    'select nombre, descripcion from ttipo_modulo',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'status':
+                $module_status_arr = [];
+                // Default.
+                $module_status_arr[AGENT_MODULE_STATUS_NORMAL] = __('Normal');
+                $module_status_arr[AGENT_MODULE_STATUS_WARNING] = __('Warning');
+                $module_status_arr[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical');
+                $module_status_arr[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown');
+                $module_status_arr[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init');
+                $input = html_print_select(
+                    $module_status_arr,
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    '',
+                    false,
+                    'width:100%',
+                    false,
+                    false,
+                    false,
+                    '',
+                    false,
+                    false,
+                    $required,
+                    false,
+                    true,
+                    true
+                );
+            break;
+
+            case 'alert_templates':
+                $input = html_print_select_from_sql(
+                    'select id, name from talert_templates',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'alert_actions':
+                $input = html_print_select_from_sql(
+                    'select id, name from talert_actions',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'interval':
+                $input = html_print_extended_select_for_time(
+                    $name,
+                    (string) $defaultValue,
+                    '',
+                    '',
+                    '0',
+                    false,
+                    true
+                );
+            break;
+
+            case 'tags':
+                $input = html_print_select_from_sql(
+                    'select id_tag, name from ttag',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'credentials.custom':
+                $input = html_print_select_from_sql(
+                    'select identifier, identifier as i  from tcredential_store WHERE product = "custom"',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'credentials.aws':
+                $input = html_print_select_from_sql(
+                    'select identifier, identifier as i  from tcredential_store WHERE product = "AWS"',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'credentials.azure':
+                $input = html_print_select_from_sql(
+                    'select identifier, identifier as i  from tcredential_store WHERE product = "AZURE"',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'credentials.sap':
+                $input = html_print_select_from_sql(
+                    'select identifier, identifier as i  from tcredential_store WHERE product = "SAP"',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'credentials.snmp':
+                $input = html_print_select_from_sql(
+                    'select identifier, identifier as i  from tcredential_store WHERE product = "SNMP"',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'credentials.gcp':
+                $input = html_print_select_from_sql(
+                    'select identifier, identifier as i  from tcredential_store WHERE product = "GOOGLE"',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'credentials.wmi':
+                $input = html_print_select_from_sql(
+                    'select identifier, identifier as i  from tcredential_store WHERE product = "WMI"',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            case 'os':
+                $input = html_print_select_from_sql(
+                    'SELECT id_os, name FROM tconfig_os ORDER BY name',
+                    $name,
+                    $defaultValue,
+                    '',
+                    ($multiple === false) ? __('None selected') : '',
+                    '',
+                    true,
+                    $multiple,
+                    true,
+                    false,
+                    'width: 100%',
+                    false,
+                    GENERIC_SIZE_TEXT,
+                    '',
+                    $required
+                );
+            break;
+
+            default:
+                $input = html_print_select(
+                    [],
+                    $name,
+                    $defaultValue,
+                    '',
+                    '',
+                    0,
+                    true
+                );
+            break;
+        }
+
+        return $input;
+    }
+
+
+    /**
+     * Draw input from parameters of .ini.
+     *
+     * @param array   $parameters Configuration of input.
+     * @param boolean $implicit   Indicates if all the configuration is indicated in the array.
+     *
+     * @return string Html from input.
+     */
+    public function drawInput($parameters, $implicit=false)
+    {
+        $input = '';
+        $defaultValue = $this->macrosValues[$parameters['macro']];
+        switch ($parameters['type']) {
+            case 'string':
+                $input = html_print_input_text(
+                    $parameters['macro'],
+                    $defaultValue,
+                    '',
+                    50,
+                    255,
+                    true,
+                    false,
+                    ($parameters['mandatory_field'] === false) ? false : true
+                );
+            break;
+
+            case 'number':
+                $config = [
+                    'type'   => 'number',
+                    'name'   => $parameters['macro'],
+                    'value'  => $defaultValue,
+                    'return' => true,
+                ];
+                if ($parameters['mandatory_field'] !== false) {
+                    $config['required'] = true;
+                }
+
+                $input = html_print_input($config);
+            break;
+
+            case 'password':
+                $isEncrypted = (bool) $this->macrosValues[$parameters['encrypt_on_true']];
+                if ($isEncrypted === true) {
+                    $defaultValueEncrypted = $this->encryptPassword($defaultValue, true);
+                    if (empty($defaultValueEncrypted) === false) {
+                        $defaultValue = $defaultValueEncrypted;
+                    }
+                }
+
+                $input = html_print_input_password(
+                    $parameters['macro'],
+                    $defaultValue,
+                    '',
+                    50,
+                    255,
+                    true,
+                    false,
+                    ($parameters['mandatory_field'] === false) ? false : true,
+                    '',
+                    'on'
+                );
+                if (empty($parameters['encrypt_on_true']) === false) {
+                    $input .= html_print_input_hidden(
+                        $parameters['macro'].'_encrypt',
+                        $parameters['encrypt_on_true'],
+                        true
+                    );
+                }
+            break;
+
+            case 'checkbox':
+                $input = html_print_checkbox_switch(
+                    $parameters['macro'],
+                    1,
+                    (bool) $defaultValue,
+                    true
+                );
+            break;
+
+            case 'textarea':
+                $input = html_print_textarea(
+                    $parameters['macro'],
+                    5,
+                    20,
+                    $defaultValue,
+                    ($parameters['mandatory_field'] === false) ? '' : 'required="required"',
+                    true
+                );
+            break;
+
+            case 'select':
+                if (in_array($parameters['select_data'], $this->pandoraSelectData) === true) {
+                    $input = $this->drawSelectPandora(
+                        $parameters['select_data'],
+                        $parameters['macro'],
+                        $defaultValue,
+                        false,
+                        ($parameters['mandatory_field'] === false) ? false : true,
+                    );
+                    $parameters['type'] = $parameters['select_data'];
+                } else {
+                    if ($implicit === false) {
+                        $options = $this->iniFile[$parameters['select_data']]['option'];
+                    } else {
+                        $options = $parameters['select_data'];
+                    }
+
+                    $input = html_print_select(
+                        $options,
+                        $parameters['macro'],
+                        $defaultValue,
+                        '',
+                        __('None selected'),
+                        '',
+                        true,
+                        false,
+                        true,
+                        '',
+                        false,
+                        'width: 100%;',
+                        false,
+                        false,
+                        false,
+                        '',
+                        false,
+                        false,
+                        ($parameters['mandatory_field'] === false) ? false : true,
+                    );
+                }
+            break;
+
+            case 'multiselect':
+                if (in_array($parameters['select_data'], $this->pandoraSelectData) === true) {
+                    $input = $this->drawSelectPandora(
+                        $parameters['select_data'],
+                        $parameters['macro'],
+                        $defaultValue,
+                        true,
+                    );
+                    $parameters['type'] = $parameters['select_data'];
+                } else {
+                    if ($implicit === false) {
+                        $options = $this->iniFile[$parameters['select_data']]['option'];
+                    } else {
+                        $options = $parameters['select_data'];
+                    }
+
+                    $input = html_print_select(
+                        $options,
+                        $parameters['macro'].'[]',
+                        json_decode($defaultValue, true),
+                        '',
+                        '',
+                        0,
+                        true,
+                        true,
+                        true,
+                        '',
+                        false,
+                        'width: 100%',
+                        false,
+                        false,
+                        false,
+                        '',
+                        false,
+                        false,
+                        false,
+                        false,
+                        true,
+                        true
+                    );
+                }
+            break;
+
+            case 'tree':
+                // Show bucket tree explorer.
+                ui_require_javascript_file('pandora_snmp_browser');
+                if ($implicit === false) {
+                    $treeData = $this->iniFile[$parameters['tree_data']];
+                    $treeInfo = $this->getTreeStructure($parameters, $treeData);
+                } else {
+                    $treeData = $parameters['tree_data'];
+                    $treeInfo = $this->getTreeStructureByScript($parameters, $treeData);
+                }
+
+                $input = ui_print_tree(
+                    $treeInfo,
+                    // Id.
+                    0,
+                    // Depth.
+                    0,
+                    // Last.
+                    0,
+                    // Last_array.
+                    [],
+                    // Sufix.
+                    true,
+                    // Return.
+                    true,
+                    // Descriptive ids.
+                    false
+                );
+            break;
+
+            default:
+                $input = html_print_input_text(
+                    $parameters['macro'],
+                    $defaultValue,
+                    '',
+                    50,
+                    255,
+                    true,
+                    false,
+                    ($parameters['mandatory_field'] === false) ? false : true
+                );
+            break;
+        }
+
+        $input .= html_print_input_hidden(
+            $parameters['macro'].'type',
+            $parameters['type'],
+            true
+        );
+        $class = '';
+        if ($parameters['show_on_true'] !== null) {
+            $class = $parameters['macro'].'_hide';
+            $input .= $this->showOnTrue($parameters['show_on_true'], $class);
+        }
+
+        $name = $parameters['name'];
+        if (empty($parameters['tip']) === false) {
+            $name .= ui_print_help_tip($parameters['tip'], true);
+        }
+
+        return html_print_label_input_block(
+            $name,
+            $input,
+            ['div_class' => $class]
+        );
+    }
+
+
+    /**
+     * Return the task app from database.
+     *
+     * @return array $task Task of database.
+     */
+    private function getTask()
+    {
+        return db_get_row_filter(
+            'trecon_task',
+            [
+                'id_app' => $this->id,
+                'id_rt'  => $this->idTask,
+                'type'   => 15,
+            ],
+        );
+    }
+
+
+    /**
+     * Returns the value of the macro.
+     *
+     * @param string $macro Name of macro for filter.
+     *
+     * @return mixed Value of the macro.
+     */
+    private function getValueMacro($macro)
+    {
+        return db_get_value_filter(
+            'value',
+            'tdiscovery_apps_tasks_macros',
+            [
+                'id_task' => $this->idTask,
+                'macro'   => $macro,
+            ]
+        );
+    }
+
+
+    /**
+     * Return form for macro form.
+     *
+     * @return array $form Form macro.
+     */
+    private function viewMacroForm()
+    {
+        $data = [];
+
+        $macros = db_get_all_rows_filter(
+            'tdiscovery_apps_tasks_macros',
+            ['id_task' => $this->idTask],
+            ['*']
+        );
+        if ($macros !== false) {
+            foreach ($macros as $key => $macro) {
+                $this->macrosValues[$macro['macro']] = io_safe_output($macro['value']);
+            }
+        }
+
+        // Process ini or script.
+        $customFields = $this->iniFile['config_steps']['custom_fields'][$this->currentPage];
+        $customFieldsByScript = $this->getStructureFormByScript($this->iniFile['config_steps']['script_data_fields'][$this->currentPage]);
+
+        if ($customFields === null && $customFieldsByScript === null) {
+            $data[0][0] = html_print_image(
+                'images/no_data_toshow.png',
+                true,
+                ['class' => 'w200px']
+            );
+            $data[1][0] = html_print_input_hidden(
+                'action',
+                'process_macro',
+                true
+            );
+            return $data;
+        }
+
+        $columns = 2;
+        if ($this->iniFile['config_steps']['fields_columns'][$this->currentPage] !== null
+            && $this->iniFile['config_steps']['fields_columns'][$this->currentPage] === 1
+        ) {
+            $columns = 1;
+        }
+
+        $row = 0;
+        $col = 0;
+        foreach ($customFieldsByScript as $key => $value) {
+            $this->nameFields[] = $value['macro'];
+            $data[$row][$col] = $this->drawInput($value, true);
+            $col++;
+            if ($col == $columns) {
+                $row++;
+                $col = 0;
+            }
+        }
+
+        foreach ($this->iniFile[$customFields]['macro'] as $key => $id) {
+            $parameters = [
+                'macro'           => $id,
+                'name'            => $this->iniFile[$customFields]['name'][$key],
+                'tip'             => $this->iniFile[$customFields]['tip'][$key],
+                'type'            => $this->iniFile[$customFields]['type'][$key],
+                'placeholder'     => $this->iniFile[$customFields]['placeholder'][$key],
+                'mandatory_field' => $this->iniFile[$customFields]['mandatory_field'][$key],
+                'show_on_true'    => $this->iniFile[$customFields]['show_on_true'][$key],
+                'encrypt_on_true' => $this->iniFile[$customFields]['encrypt_on_true'][$key],
+                'select_data'     => $this->iniFile[$customFields]['select_data'][$key],
+                'tree_data'       => $this->iniFile[$customFields]['tree_data'][$key],
+            ];
+            $this->nameFields[] = $id;
+            $data[$row][$col] = $this->drawInput($parameters);
+            $col++;
+            if ($col == $columns) {
+                $row++;
+                $col = 0;
+            }
+        }
+
+        $data[($row + 1)][1] = html_print_input_hidden(
+            'action',
+            'process_macro',
+            true
+        );
+        $data[($row + 1)][1] .= html_print_input_hidden(
+            'name_fields',
+            implode(',', $this->nameFields),
+            true
+        );
+
+        return $data;
+    }
+
+
+    /**
+     * Return form for task definition.
+     *
+     * @return array $form Form for task definition.
+     */
+    private function viewTaskDefinition()
+    {
+        $task = $this->getTask();
+
+        $data = [];
+        $data[0][0] = html_print_label_input_block(
+            __('Task name'),
+            html_print_input_text(
+                'task_name',
+                $task['name'],
+                '',
+                50,
+                255,
+                true,
+                false,
+                true
+            )
+        );
+
+        $data[1][0] = html_print_label_input_block(
+            __('Description'),
+            html_print_textarea(
+                'description',
+                5,
+                20,
+                $task['description'],
+                '',
+                true
+            )
+        );
+
+        $data[2][0] = html_print_label_input_block(
+            __('Discovery server'),
+            html_print_select_from_sql(
+                sprintf(
+                    'SELECT id_server, name
+                                    FROM tserver
+                                    WHERE server_type = %d
+                                    ORDER BY name',
+                    SERVER_TYPE_DISCOVERY
+                ),
+                'discovery_server',
+                $task['id_recon_server'],
+                '',
+                '',
+                '0',
+                true,
+                false,
+                true,
+                false,
+                false,
+                false,
+                GENERIC_SIZE_TEXT,
+                '',
+                false
+            )
+        );
+
+        $data[3][0] = html_print_label_input_block(
+            __('Group'),
+            html_print_select_groups(
+                false,
+                'AR',
+                false,
+                'group',
+                $task['id_group'],
+                '',
+                '',
+                0,
+                true,
+                false,
+                false,
+                '',
+                false,
+                false,
+                false,
+                false,
+                'id_grupo',
+                false,
+                false,
+                false,
+                false,
+                false,
+                true
+            )
+        );
+
+        $inputs_interval = html_print_select(
+            [
+                'defined' => 'Defined',
+                'manual'  => 'Manual',
+            ],
+            'mode_interval',
+            ($task['interval_sweep'] === '0') ? 'manual' : 'defined',
+            'changeModeInterval(this)',
+            '',
+            '0',
+            true,
+            false,
+            true,
+            '',
+            false
+        ).html_print_extended_select_for_time(
+            'interval',
+            (empty($task['interval_sweep']) === true) ? '300' : $task['interval_sweep'],
+            '',
+            '',
+            '0',
+            false,
+            true,
+            false,
+            true,
+        );
+        $js_variables = '<script>const interval = "'.$task['interval_sweep'].'";</script>';
+        $data[4][0] = html_print_label_input_block(
+            __('Interval'),
+            html_print_div(
+                [
+                    'style'   => 'display: flex;max-width: 345px; justify-content: space-between;',
+                    'content' => $inputs_interval.$js_variables,
+                ],
+                true
+            )
+        );
+
+        $data[5][0] = html_print_label_input_block(
+            __('Timeout').ui_print_help_tip('This timeout will be applied for each task execution', true),
+            html_print_extended_select_for_time(
+                'tiemout',
+                (empty($task['executions_timeout']) === true) ? '60' : $task['executions_timeout'],
+                '',
+                '',
+                '0',
+                false,
+                true
+            ),
+        );
+
+        $data[6][0] = html_print_input_hidden(
+            'action',
+            'task_definition_form',
+            true
+        );
+
+        $data[7][0] = html_print_input_hidden(
+            'id_task',
+            $task['id_rt'],
+            true
+        );
+
+        return $data;
+    }
+
+
+    /**
+     * Sabe data from task definition form.
+     *
+     * @return string $error Error string if exist.
+     */
+    private function processTaskDefinition()
+    {
+        $taskName = get_parameter('task_name', '');
+        $description = get_parameter('description', '');
+        $discoveryServer = get_parameter('discovery_server', '');
+        $group = get_parameter('group', 0);
+        $mode_interval = get_parameter('mode_interval', 'defined');
+        $interval = get_parameter('interval', '');
+        $tiemout = get_parameter('tiemout', 60);
+        $completeTask = get_parameter('complete_button', '');
+
+        if ($mode_interval === 'manual') {
+            $interval = '0';
+        }
+
+        $error = false;
+
+        if ($taskName === ''
+            || $discoveryServer === ''
+            || $group === ''
+            || $interval === ''
+        ) {
+            $error = __('Fields empties');
+            return $error;
+        }
+
+        if ($this->idTask === '') {
+            db_process_sql_begin();
+            try {
+                $_idTask = db_process_sql_insert(
+                    'trecon_task',
+                    [
+                        'id_app'             => $this->id,
+                        'name'               => $taskName,
+                        'description'        => $description,
+                        'id_group'           => $group,
+                        'interval_sweep'     => $interval,
+                        'id_recon_server'    => $discoveryServer,
+                        'type'               => 15,
+                        'setup_complete'     => (empty($completeTask) === false) ? 1 : 0,
+                        'executions_timeout' => $tiemout,
+                    ]
+                );
+
+                if ($_idTask === false) {
+                    $error = __('Error creating the discovery task');
+                } else {
+                    $this->idTask = $_idTask;
+                    $this->autoLoadConfigMacro();
+                }
+            } catch (Exception $e) {
+                $error = __('Error creating the discovery task');
+            }
+
+            if ($error === false) {
+                db_process_sql_commit();
+            } else {
+                db_process_sql_rollback();
+            }
+        } else {
+            $result = db_process_sql_update(
+                'trecon_task',
+                [
+                    'id_app'             => $this->id,
+                    'name'               => $taskName,
+                    'description'        => $description,
+                    'id_group'           => $group,
+                    'interval_sweep'     => $interval,
+                    'id_recon_server'    => $discoveryServer,
+                    'type'               => 15,
+                    'setup_complete'     => (empty($completeTask) === false) ? 1 : 0,
+                    'executions_timeout' => $tiemout,
+                ],
+                ['id_rt' => $this->idTask]
+            );
+
+            if ($result === false) {
+                $error = __('Error updating the discovery task');
+            }
+        }
+
+        return $error;
+    }
+
+
+    /**
+     * Process the values of input from macro defined in .ini
+     *
+     * @return string $error Error string if exist.
+     */
+    private function processCustomMacro()
+    {
+        $error = false;
+
+        $keyParameters = explode(',', get_parameter('name_fields', ''));
+
+        foreach ($keyParameters as $v => $key) {
+            $type = get_parameter($key.'type', '');
+            switch ($type) {
+                case 'checkbox':
+                    $value = get_parameter_switch($key, 0);
+                break;
+
+                case 'multiselect':
+                    $value = io_safe_input(json_encode(get_parameter($key, '')));
+                break;
+
+                case 'password':
+                    $value = get_parameter($key, '');
+                    $encryptKey = get_parameter($key.'_encrypt', '');
+                    if ($encryptKey !== '') {
+                        $encrypt = (bool) get_parameter_switch($encryptKey, 0);
+                        if ($encrypt === true) {
+                            $valueEncrypt = $this->encryptPassword($value);
+                            if (empty($valueEncrypt) === false) {
+                                $value = $valueEncrypt;
+                            }
+                        }
+                    }
+                break;
+
+                default:
+                    $value = get_parameter($key, '');
+                break;
+            }
+
+            if (is_array($value) === true) {
+                $value = io_safe_input(json_encode($value));
+            }
+
+            $exist = db_get_row_filter(
+                'tdiscovery_apps_tasks_macros',
+                [
+                    'id_task' => $this->idTask,
+                    'macro'   => $key,
+                ]
+            );
+
+            if (in_array($type, $this->pandoraSelectData) === false) {
+                $type = 'custom';
+            }
+
+            if ($exist === false) {
+                $result = db_process_sql_insert(
+                    'tdiscovery_apps_tasks_macros',
+                    [
+                        'id_task' => $this->idTask,
+                        'macro'   => $key,
+                        'value'   => $value,
+                        'type'    => $type,
+                    ]
+                );
+                if ($result === false) {
+                    $error = __('Field %s not insert', $key);
+                }
+            } else {
+                $result = db_process_sql_update(
+                    'tdiscovery_apps_tasks_macros',
+                    [
+                        'value' => $value,
+                        'type'  => $type,
+                    ],
+                    [
+                        'id_task' => $this->idTask,
+                        'macro'   => $key,
+                    ]
+                );
+                if ($result === false) {
+                    $error = __('Field %s not updated', $key);
+                }
+            }
+        }
+
+        $completeTask = get_parameter('complete_button', '');
+        if (empty($completeTask) === false) {
+            $result = db_process_sql_update(
+                'trecon_task',
+                ['setup_complete' => 1],
+                ['id_rt' => $this->idTask]
+            );
+            if ($result === false) {
+                $error = __('Task not updated');
+            }
+        }
+
+        return $error;
+    }
+
+
+    /**
+     * Check if name of input macro is correct.
+     *
+     * @param string $name Name of input.
+     *
+     * @return boolean value true if name is correct.
+     */
+    private function isCorrectNameInput($name)
+    {
+        if (substr($name, 0, 1) === '_' && substr($name, -1) === '_') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * Return logic for component show on true.
+     *
+     * @param string $checkbox      Name the checkbox for hide input.
+     * @param string $elementToHide Name the element to hide HIS PARENT.
+     *
+     * @return string String Name the element
+     */
+    private function showOnTrue($checkbox, $elementToHide)
+    {
+        return '<script>
+                $(document).ready(function(){
+                    if($("[name='.$checkbox.']").length > 0){
+                        if(!$("[name='.$checkbox.']")[0].checked) {
+                            $(".'.$elementToHide.'").hide();
+                        }
+                        $("[name='.$checkbox.']").on("change",
+                        function(e) {
+                            if (e.currentTarget.checked) {
+                                $(".'.$elementToHide.'").show();
+                            } else {
+                                $(".'.$elementToHide.'").hide();
+                            }
+                        });
+                    }
+                })
+                </script>';
+    }
+
+
+    /**
+     * Load the macros task in database
+     *
+     * @throws Exception Excepcion to control possible error for default value.
+     *
+     * @return void
+     */
+    private function autoLoadConfigMacro()
+    {
+        $defaultValues = $this->iniFile['discovery_extension_definition']['default_value'];
+
+        foreach ($defaultValues as $key => $value) {
+            if ($value === false) {
+                $value = 0;
+            }
+
+            $result = db_process_sql_insert(
+                'tdiscovery_apps_tasks_macros',
+                [
+                    'id_task' => $this->idTask,
+                    'macro'   => $key,
+                    'value'   => (string) io_safe_input($value),
+                    'type'    => 'custom',
+                ]
+            );
+            if ($result === false) {
+                throw new Exception('Error creating task');
+            }
+        }
+
+        $tempFiles = $this->iniFile['tempfile_confs']['file'];
+
+        foreach ($tempFiles as $key => $value) {
+            $result = db_process_sql_insert(
+                'tdiscovery_apps_tasks_macros',
+                [
+                    'id_task'   => $this->idTask,
+                    'macro'     => $key,
+                    'value'     => (string) io_safe_input($value),
+                    'type'      => 'custom',
+                    'temp_conf' => 1,
+                ]
+            );
+            if ($result === false) {
+                throw new Exception('Error creating task');
+            }
+        }
+    }
+
+
+    /**
+     * Return array structure for draw tree when array is by .ini.
+     *
+     * @param array $parent        Parent from the tree.
+     * @param array $firstChildren First children from parent.
+     *
+     * @return array $treeInfo Return the array with format for render treee
+     */
+    private function getTreeStructure($parent, $firstChildren)
+    {
+        $treeInfo = [];
+        foreach ($firstChildren['name'] as $key => $value) {
+            $checked = false;
+            $name = (empty($firstChildren['macro'][$key]) === false) ? $firstChildren['macro'][$key].'[]' : $parent['id'].'[]';
+            $nameField = (empty($firstChildren['macro'][$key]) === false) ? $firstChildren['macro'][$key] : $parent['id'];
+            if (in_array($nameField, $this->nameFields) === false) {
+                $this->nameFields[] = $nameField;
+            }
+
+            $checkedValues = json_decode(io_safe_output($this->macrosValues[$nameField]), true);
+            if (empty($checkedValues) === false) {
+                if (in_array($firstChildren['value'][$key], $checkedValues)) {
+                    $checked = true;
+                }
+            }
+
+            $treeInfo['__LEAVES__'][$key] = [
+                'label'      => $value,
+                'selectable' => (bool) $firstChildren['selectable'][$key],
+                'name'       => $name,
+                'value'      => $firstChildren['value'][$key],
+                'checked'    => $checked,
+            ];
+
+            if (empty($firstChildren['children'][$key]) === false) {
+                $children = $this->iniFile[$firstChildren['children'][$key]];
+                $treeInfo['__LEAVES__'][$key]['sublevel'] = $this->getTreeStructure($parent, $children);
+            }
+        }
+
+        return $treeInfo;
+    }
+
+
+    /**
+     * Return array structure for draw tree when array is by script.
+     *
+     * @param array $parent        Parent from the tree.
+     * @param array $firstChildren First children from parent.
+     *
+     * @return array $treeInfo Return the array with format for render treee
+     */
+    private function getTreeStructureByScript($parent, $firstChildren)
+    {
+        $treeInfo = [];
+        foreach ($firstChildren as $key => $value) {
+            $checked = false;
+            $name = (empty($value['macro']) === false) ? $value['macro'].'[]' : $parent['macro'].'[]';
+            $nameField = (empty($value['macro']) === false) ? $value['macro'] : $parent['macro'];
+            if (in_array($nameField, $this->nameFields) === false) {
+                $this->nameFields[] = $nameField;
+            }
+
+            $checkedValues = json_decode(io_safe_output($this->macrosValues[$nameField]), true);
+            if (empty($checkedValues) === false) {
+                if (in_array($value['value'], $checkedValues, true) === true) {
+                    $checked = true;
+                }
+            }
+
+            $treeInfo['__LEAVES__'][$key] = [
+                'label'      => $value['name'],
+                'selectable' => (bool) $value['selectable'],
+                'name'       => $name,
+                'value'      => $value['value'],
+                'checked'    => $checked,
+            ];
+
+            if (empty($value['children']) === false) {
+                $children = $value['children'];
+                $treeInfo['__LEAVES__'][$key]['sublevel'] = $this->getTreeStructureByScript($parent, $children);
+            }
+        }
+
+        return $treeInfo;
+    }
+
+
+    /**
+     * Return a json with the form structure for draw.
+     *
+     * @param mixed $command String.
+     *
+     * @return array Result of command.
+     */
+    private function getStructureFormByScript($command)
+    {
+        global $config;
+        $executionFiles = $this->iniFile['discovery_extension_definition']['execution_file'];
+        foreach ($executionFiles as $key => $file) {
+            $file = $config['homedir'].$this->path.'/'.$this->mode.'/'.$file;
+            $command = str_replace($key, $file, $command);
+        }
+
+        $values = $this->replaceValues($command);
+        $command = $values['command'];
+        $toDelete = $values['delete'];
+        if (empty($command) === false) {
+            $result = $this->executeCommand($command);
+        }
+
+        if (count($toDelete) > 0) {
+            foreach ($toDelete as $key => $folder) {
+                Files::rmrf($folder);
+            }
+        }
+
+        return json_decode($result, true);
+    }
+
+
+    /**
+     * Replace values in command
+     *
+     * @param string $command String command for replace macros.
+     *
+     * @return array $values Command and files to delete.
+     */
+    private function replaceValues($command)
+    {
+        preg_match_all('/\b_[a-zA-Z0-9]*_\b/', $command, $matches);
+        $foldersToDelete = [];
+        foreach ($matches[0] as $key => $macro) {
+            $row = db_get_row_filter(
+                'tdiscovery_apps_tasks_macros',
+                [
+                    'macro'   => $macro,
+                    'id_task' => $this->idTask,
+                ]
+            );
+            if ($row !== false) {
+                if (in_array($row['type'], $this->pandoraSelectData) === true) {
+                    $value = $this->getValuePandoraSelect($row['type'], $row['value']);
+                    $command = str_replace($macro, $value, $command);
+                } else if ((int) $row['temp_conf'] === 1) {
+                    $nameFile = $row['id_task'].'_'.$row['id_task'].'_'.uniqid();
+                    $value = $this->getValueTempFile($nameFile, $row['value']);
+                    $command = str_replace($macro, $value, $command);
+                    $foldersToDelete[] = str_replace($nameFile, '', $value);
+                } else {
+                    $command = str_replace($macro, io_safe_output($row['value']), $command);
+                }
+            }
+        }
+
+        return [
+            'command' => $command,
+            'delete'  => $foldersToDelete,
+        ];
+    }
+
+
+    /**
+     * Create a temp file for tempfile_confs macros.
+     *
+     * @param string $nameFile Name file only.
+     * @param string $content  Content to save to file.
+     *
+     * @return string $pathNameFile Name file and with path for replace.
+     */
+    private function getValueTempFile($nameFile, $content)
+    {
+        global $config;
+        $content = io_safe_output($content);
+        $content = $this->replaceValues($content)['command'];
+        $nameTempDir = $config['attachment_store'].'/temp_files/';
+        if (file_exists($nameTempDir) === false) {
+            mkdir($nameTempDir);
+        }
+
+        $tmpPath = Files::tempdirnam(
+            $nameTempDir,
+            'temp_files_'
+        );
+        $pathNameFile = $tmpPath.'/'.$nameFile;
+        file_put_contents($pathNameFile, $content);
+
+        return $pathNameFile;
+    }
+
+
+    /**
+     * Return the correct value for pandora select
+     *
+     * @param string $type Type of input.
+     * @param string $id   Value of the row macro.
+     *
+     * @return string $id New id with the values replaced
+     */
+    private function getValuePandoraSelect($type, $id)
+    {
+        $id = io_safe_output($id);
+        $idsArray = json_decode($id);
+        if (is_array($idsArray) === false) {
+            $idsArray = [$id];
+        }
+
+        foreach ($idsArray as $key => $v) {
+            $value = false;
+            switch ($type) {
+                case 'agent_groups':
+                    $value = groups_get_name($v);
+                break;
+
+                case 'module_groups':
+                    $value = modules_get_modulegroup_name($v);
+                break;
+
+                case 'tags':
+                    $value = tags_get_name($v);
+                break;
+
+                case 'alert_templates':
+                    $value = alerts_get_alert_template_name($v);
+                break;
+
+                case 'alert_actions':
+                    $value = alerts_get_alert_action_name($v);
+                break;
+
+                case 'credentials.custom':
+                    $credentials = CredentialStore::getKey($v);
+                    $value = base64_encode(
+                        json_encode(
+                            [
+                                'user'     => $credentials['username'],
+                                'password' => $credentials['password'],
+                            ]
+                        )
+                    );
+                break;
+
+                case 'credentials.aws':
+                    $credentials = CredentialStore::getKey($v);
+                    $value = base64_encode(
+                        json_encode(
+                            [
+                                'access_key_id'     => $credentials['username'],
+                                'secret_access_key' => $credentials['password'],
+                            ]
+                        )
+                    );
+                break;
+
+                case 'credentials.azure':
+                    $credentials = CredentialStore::getKey($v);
+                    $value = base64_encode(
+                        json_encode(
+                            [
+                                'client_id'          => $credentials['username'],
+                                'application_secret' => $credentials['password'],
+                                'tenant_domain'      => $credentials['extra_1'],
+                                'subscription_id'    => $credentials['extra_2'],
+                            ]
+                        )
+                    );
+                break;
+
+                case 'credentials.gcp':
+                    $credentials = CredentialStore::getKey($v);
+                    $value = base64_encode($credentials['extra_1']);
+                break;
+
+                case 'credentials.sap':
+                    $credentials = CredentialStore::getKey($v);
+                    $value = base64_encode(
+                        json_encode(
+                            [
+                                'user'     => $credentials['username'],
+                                'password' => $credentials['password'],
+                            ]
+                        )
+                    );
+                break;
+
+                case 'credentials.snmp':
+                    $credentials = CredentialStore::getKey($v);
+                    $value = base64_encode($credentials['extra_1']);
+                break;
+
+                case 'credentials.wmi':
+                    $credentials = CredentialStore::getKey($v);
+                    $value = base64_encode(
+                        json_encode(
+                            [
+                                'user'      => $credentials['username'],
+                                'password'  => $credentials['password'],
+                                'namespace' => $credentials['extra_1'],
+                            ]
+                        )
+                    );
+                break;
+
+                case 'os':
+                    $value = get_os_name($v);
+                break;
+
+                default:
+                continue;
+            }
+
+            if ($value !== false) {
+                $id = str_replace($v, io_safe_output($value), $id);
+            }
+        }
+
+        return $id;
+    }
+
+
+    /**
+     * Encrypt and decode password with the user script.
+     *
+     * @param string  $password Password to encrypt.
+     * @param boolean $decode   True for decode password.
+     *
+     * @return string Password encrypted
+     */
+    private function encryptPassword($password, $decode=false)
+    {
+        global $config;
+        if ($decode === false) {
+            $command = $this->iniFile['discovery_extension_definition']['passencrypt_exec'];
+            $nameFile = $this->iniFile['discovery_extension_definition']['passencrypt_script'];
+            $file = $config['homedir'].$this->path.'/'.$this->mode.'/'.$nameFile;
+            $command = str_replace('_passencrypt_script_', $file, $command);
+        } else {
+            $command = $this->iniFile['discovery_extension_definition']['passdecrypt_exec'];
+            $nameFile = $this->iniFile['discovery_extension_definition']['passdecrypt_script'];
+            $file = $config['homedir'].$this->path.'/'.$this->mode.'/'.$nameFile;
+            $command = str_replace('_passdecrypt_script_', $file, $command);
+        }
+
+        $command = str_replace('_password_', $password, $command);
+
+        if (empty($command) === false) {
+            return $this->executeCommand($command);
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * Valid the .ini
+     *
+     * @param array $iniForValidate IniFile to validate.
+     *
+     * @return mixed Return false if is ok and string for error.
+     */
+    public static function validateIni($iniForValidate)
+    {
+        $discoveryExtension = $iniForValidate['discovery_extension_definition'];
+
+        if (!$discoveryExtension) {
+            return __('The file does not contain the block \'discovery_extension_definition\'');
+        }
+
+        if (!array_key_exists('short_name', $discoveryExtension)) {
+            return __('The \'discovery_extension_definition\' block must contain a \'short_name\' parameter');
+        }
+
+        $defaultValues = $discoveryExtension['default_value'];
+        foreach ($defaultValues as $key => $value) {
+            if (!preg_match('/^_[a-zA-Z0-9]+_$/', $key)) {
+                return __(
+                    'The \'discovery_extension_definition\' block \'default_value\' parameter has a key with invalid format. Use only letters (A-Z and a-z) and numbers (0-9) between opening and ending underscores (_): \'%s\'',
+                    $key
+                );
+            }
+        }
+
+        $shortName = $discoveryExtension['short_name'];
+
+        if (!preg_match('/^[A-Za-z0-9._-]+$/', $shortName)) {
+            return __('The \'discovery_extension_definition\' block \'short_name\' parameter contains illegal characters. Use only letters (A-Z and a-z), numbers (0-9), points (.), hyphens (-) and underscores (_)');
+        }
+
+        if (!array_key_exists('section', $discoveryExtension) || !array_key_exists('name', $discoveryExtension)) {
+            return __('The \'discovery_extension_definition\' block must contain a \'section\' and a \'name\' parameters');
+        }
+
+        $section = $discoveryExtension['section'];
+        $name = $discoveryExtension['name'];
+
+        if (!in_array($section, ['app', 'cloud', 'custom'])) {
+            return __('The \'discovery_extension_definition\' block \'section\' parameter must be \'app\', \'cloud\' or \'custom\'');
+        }
+
+        if (empty($name)) {
+            return __('The \'discovery_extension_definition\' block \'name\' parameter can not be empty');
+        }
+
+        if (!array_key_exists('exec', $discoveryExtension)) {
+            return __('The \'discovery_extension_definition\' block must contain an \'exec\' parameter');
+        }
+
+        $execs = $discoveryExtension['exec'];
+
+        foreach ($execs as $exec) {
+            if (empty($exec)) {
+                return __('All the \'discovery_extension_definition\' block \'exec\' parameter definitions can not be empty');
+            }
+        }
+
+        $checkEmptyFields = [
+            'passencrypt_script',
+            'passencrypt_exec',
+            'passdecrypt_script',
+            'passdecrypt_exec',
+        ];
+
+        foreach ($checkEmptyFields as $key) {
+            if ($discoveryExtension[$key] !== null && empty($discoveryExtension[$key]) === true) {
+                return __('The \'discovery_extension_definition\' block \'%s\' parameter can not be empty', $key);
+            }
+        }
+
+        foreach ($discoveryExtension['execution_file'] as $key => $value) {
+            if (!preg_match('/^_[a-zA-Z0-9]+_$/', $key)) {
+                return __('The \'discovery_extension_definition\' block \'execution_file\' parameter has a key with invalid format. Use only letters (A-Z and a-z) and numbers (0-9) between opening and ending underscores (_): \'%s\'', $key);
+            }
+
+            if (empty($value) === true) {
+                return __('All the \'discovery_extension_definition\' block \'execution_file\' parameter definitions can not be empty: \'%s\'', $key);
+            }
+        }
+
+        if ($iniForValidate['config_steps'] !== null && empty($iniForValidate['config_steps']) === true) {
+            return __('The \'config_steps\' block must contain a \'name\' parameter that can not be empty.');
+        }
+
+        foreach ($iniForValidate['config_steps'] as $key => $value) {
+            foreach ($value as $innerKey => $inner_value) {
+                if (isset($inner_steps[$innerKey])) {
+                    $inner_steps[$innerKey][$key] = $inner_value;
+                } else {
+                    $inner_steps[$innerKey] = [$key => $inner_value];
+                }
+            }
+        }
+
+        $customFields = [];
+        foreach ($inner_steps as $key => $step) {
+            if (is_numeric($key) === false || $key === 0) {
+                return __('All the \'config_steps\' block parameters must use numbers greater than 0 as keys: \'%s\'.', $key);
+            }
+
+            if (empty($step['name']) === true) {
+                return __('The \'config_steps\' block must contain a \'name\' parameter for all the configuration steps: \'%s\'', $key);
+            }
+
+            if (empty($step['custom_fields']) === true
+                && empty($step['script_data_fields']) === true
+            ) {
+                return __('The \'config_steps\' block must contain a \'custom_fields\' or \'script_data_fields\' parameter that can not be empty');
+            } else if (empty($step['custom_fields']) === false) {
+                if (empty($iniForValidate[$step['custom_fields']]) === true) {
+                    return __('The \'config_steps\' block \'custom_fields\' parameter has a key value reference that does not exist: \'%s\'', $step['custom_fields']);
+                } else {
+                    $customFields[] = $step['custom_fields'];
+                }
+            }
+
+            $customFields[] = $step['name'];
+        }
+
+        $requiredKeys = [
+            'macro',
+            'name',
+            'type',
+        ];
+
+        $validTypes = [
+            'string',
+            'number',
+            'password',
+            'textarea',
+            'checkbox',
+            'select',
+            'multiselect',
+            'tree',
+        ];
+
+        $validSelectData = [
+            'agent_groups',
+            'agents',
+            'module_groups',
+            'modules',
+            'module_types',
+            'status',
+            'alert_templates',
+            'alert_actions',
+            'interval',
+            'tags',
+            'credentials.custom',
+            'credentials.aws',
+            'credentials.azure',
+            'credentials.sap',
+            'credentials.snmp',
+            'credentials.gcp',
+            'credentials.wmi',
+            'os',
+        ];
+
+        $selectDataNames = [];
+        $treeDataNames = [];
+
+        foreach ($customFields as $key => $customField) {
+            $innerFields = [];
+            foreach ($iniForValidate[$customField] as $key => $value) {
+                foreach ($value as $innerKey => $innerValue) {
+                    if (isset($innerFields[$innerKey])) {
+                        $innerFields[$innerKey][$key] = $innerValue;
+                    } else {
+                        $innerFields[$innerKey] = [$key => $innerValue];
+                    }
+                }
+            }
+
+            foreach ($innerFields as $key => $field) {
+                if (is_numeric($key) === false || $key === 0) {
+                    return __('All the \'%s\' block parameters must use numbers greater than 0 as keys: \'%s\'.', $customField, $key);
+                }
+
+                foreach ($requiredKeys as $k => $value) {
+                    if (empty($field[$value]) === true) {
+                            return __('The \'%s\' block \'%s\' parameter definitions can not be empty: \'%s\'.', $customField, $value, $key);
+                    }
+                }
+
+                if (!preg_match('/^_[a-zA-Z0-9]+_$/', $field['macro'])) {
+                    return __('The \'%s\' block \'macro\' parameter has a definition with invalid format. Use only letters (A-Z and a-z) and numbers (0-9) between opening and ending underscores (_): \'%s\'', $customField, $field['macro']);
+                }
+
+                if (in_array($field['type'], $validTypes) === false) {
+                    return __('The \'%s\' block \'type\' parameter has a definition with invalid value. Must be \'string\', \'number\', \'password\', \'textarea\', \'checkbox\', \'select\', \'multiselect\' or \'tree\': \'%s\'', $customField, $field['type']);
+                }
+
+                if ($field['type'] === 'select' || $field['type'] === 'multiselect') {
+                    if (empty($field['select_data']) === true) {
+                        return __('All the \'%s\' block \'select_data\' parameter definitions can not be empty: \'%s\'.', $customField, $key);
+                    } else if ($iniForValidate[$field['select_data']] === null && in_array($field['select_data'], $validSelectData) === false) {
+                        return __(
+                            'The \'%s\' block \'select_data\' parameter has a definition with invalid select type. Must be \'agent_groups\', \'agents\', \'module_groups\', \'modules\', \'module_types\', \'tags\', \'status\', \'alert_templates\', \'alert_actions\', \'interval\', \'credentials.custom\', \'credentials.aws\', \'credentials.azure\', \'credentials.gcp\', \'credentials.sap\', \'credentials.snmp\', \'os\' or an existint reference: \'%s\'',
+                            $customField,
+                            $field['select_data']
+                        );
+                    } else if ($iniForValidate[$field['select_data']] !== null) {
+                        $selectDataNames[] = $field['select_data'];
+                    }
+                }
+
+                if ($field['type'] === 'tree') {
+                    if (empty($field['tree_data']) === true) {
+                        return __('All the \'%s\' block \'tree_data\' parameter definitions can not be empty: \'%s\'', $field['macro'], $key);
+                    } else if ($iniForValidate[$field['tree_data']] === null) {
+                        return __('The \'%s\' block \'tree_data\' parameter has a key value reference that does not exist: \'%s\'', $customField, $field['tree_data']);
+                    } else {
+                        $treeDataNames[] = $field['tree_data'];
+                    }
+                }
+
+                if (empty($field['mandatory_field']) === false) {
+                    $validValues = [
+                        'true',
+                        'false',
+                        '1',
+                        '0',
+                        'yes',
+                        'no',
+                    ];
+
+                    if (in_array($field['mandatory_field'], $validValues) === false) {
+                        return __(
+                            'The \'%s\' block \'mandatory_field\' parameter has a definition with invalid value. Must be \'true\' or \'false\', \'1\' or \'0\', \'yes\' or \'no\': \'%s\'',
+                            $customField,
+                            $field['mandatory_field']
+                        );
+                    }
+                }
+
+                if ($field['tip'] !== null && empty($field['tip']) === true) {
+                    return __('All the \'%s\' block \'tip\' parameter definitions can not be empty: \'%s\'.', $customField, $key);
+                }
+
+                if ($field['placeholder'] !== null && empty($field['placeholder']) === true) {
+                    return __('All the \'%s\' block \'placeholder\' parameter definitions can not be empty: \'%s\'.', $customField, $key);
+                }
+
+                if (empty($field['show_on_true']) === false) {
+                    if (!preg_match('/^_[a-zA-Z0-9]+_$/', $field['show_on_true'])) {
+                        return __(
+                            'The \'%s\' block \'show_on_true\' parameter has a definition with invalid format. Use only letters (A-Z and a-z) and numbers (0-9) between opening and ending underscores (_): \'%s\'',
+                            $customField,
+                            $field['show_on_true']
+                        );
+                    }
+                }
+
+                if (empty($field['encrypt_on_true']) === false) {
+                    if (!preg_match('/^_[a-zA-Z0-9]+_$/', $field['encrypt_on_true'])) {
+                        return __(
+                            'The \'%s\' block \'encrypt_on_true\' parameter has a definition with invalid format. Use only letters (A-Z and a-z) and numbers (0-9) between opening and ending underscores (_): \'%s\'',
+                            $customField,
+                            $field['encrypt_on_true']
+                        );
+                    }
+                }
+            }
+        }
+
+        foreach ($treeDataNames as $key => $name) {
+            $error = self::validateTreeRecursive($name, $iniForValidate);
+            if ($error !== false) {
+                return $error;
+            }
+        }
+
+        foreach ($selectDataNames as $key => $name) {
+            if (empty($iniForValidate[$name]['option']) === true) {
+                return __('The \'%s\' block must contain an \'option\' parameter', $name);
+            }
+
+            foreach ($iniForValidate[$name]['option'] as $key => $option) {
+                if (empty($option) === true) {
+                    return __('All the \'%s\' block \'option\' parameter definitions can not be empty: \'%s\'.', $name, $key);
+                }
+            }
+        }
+
+        if ($iniForValidate['tempfile_confs'] !== null && empty($iniForValidate['tempfile_confs']['file']) === true) {
+            return __('The \'tempfile_confs\' block must contain a \'file\' parameter.');
+        }
+
+        foreach ($iniForValidate['tempfile_confs']['file'] as $key => $tempfile) {
+            if (!preg_match('/^_[a-zA-Z0-9]+_$/', $key)) {
+                return __(
+                    'The \'tempfile_confs\' block \'file\' parameter has a key with invalid format. Use only letters (A-Z and a-z) and numbers (0-9) between opening and ending underscores (_): \'%s\'',
+                    $key
+                );
+            }
+
+            if (empty($tempfile) === true) {
+                return __('All the \'tempfile_confs\' block \'file\' parameter definitions can not be empty: \'%s\'.', $key);
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Validate a tree recursively
+     *
+     * @param string $dataTree Name of parent data_tree.
+     * @param array  $iniFile  Inifile for search children.
+     * @param array  $parents  Array of parents for recursive action, DO NOT SET.
+     *
+     * @return boolean True if tree is correct.
+     */
+    public static function validateTreeRecursive($dataTree, $iniFile, $parents=[])
+    {
+        $innerData = [];
+        $parents[] = $dataTree;
+        foreach ($iniFile[$dataTree] as $key => $value) {
+            foreach ($value as $innerKey => $innerValue) {
+                if (isset($innerData[$innerKey])) {
+                    $innerData[$innerKey][$key] = $innerValue;
+                } else {
+                    $innerData[$innerKey] = [$key => $innerValue];
+                }
+            }
+        }
+
+        if (count($innerData) === 0) {
+            return __('The \'%s\' block must contain a \'name\' parameter that can not be empty.', $dataTree);
+        }
+
+        foreach ($innerData as $key => $prop) {
+            if (is_numeric($key) === false || $key === 0) {
+                return __('All the \'%s\' block parameters must use numbers greater than 0 as keys: \'%s\'.', $dataTree, $key);
+            }
+
+            if (empty($prop['name']) === true) {
+                return __('The \'%s\' block must contain a \'name\' parameter for all the tree elements: \'%s\'.', $dataTree, $key);
+            }
+
+            if ($prop['selectable'] !== null && $prop['selectable'] === '') {
+                return __('All the \'%s\' block \'selectable\' parameter definitions can not be empty: \'%s\'.', $dataTree, $key);
+            } else {
+                $validValues = [
+                    'true',
+                    'false',
+                    '1',
+                    '0',
+                    'yes',
+                    'no',
+                ];
+
+                if (in_array($prop['selectable'], $validValues) === false) {
+                    return __(
+                        'The \'%s\' block \'selectable\' parameter has a definition with invalid value. Must be \'true\' or \'false\', \'1\' or \'0\', \'yes\' or \'no\': \'%s\'',
+                        $dataTree,
+                        $prop['selectable']
+                    );
+                }
+            }
+
+            if ($prop['macro'] !== null && !preg_match('/^_[a-zA-Z0-9]+_$/', $prop['macro'])) {
+                return __(
+                    'The \'%s\' block \'macro\' parameter has a definition with invalid format. Use only letters (A-Z and a-z) and numbers (0-9) between opening and ending underscores (_): \'%s\'',
+                    $dataTree,
+                    $prop['macro']
+                );
+            }
+
+            if ($prop['children'] !== null && empty($iniFile[$prop['children']]) === true) {
+                return __('The \'%s\' block \'children\' parameter has a key value reference that does not exist: \'%s\'', $dataTree, $prop['children']);
+            } else if (in_array($prop['children'], $parents) === true) {
+                return __('The \'%s\' block \'children\' parameter has a key value reference to a parent tree element: \'%s\'', $dataTree, $prop['children']);
+            } else if (empty($iniFile[$prop['children']]) === false) {
+                $result = self::validateTreeRecursive($prop['children'], $iniFile, $parents);
+                if ($result !== false) {
+                    return $result;
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Excute command with the timeout of the task.
+     *
+     * @param string $command Command to execute.
+     *
+     * @return string Output of command
+     */
+    private function executeCommand($command)
+    {
+        $task = $this->getTask();
+        $timeout = $task['executions_timeout'];
+
+        $descriptors = [
+            0 => [
+                'pipe',
+                'r',
+            ],
+            1 => [
+                'pipe',
+                'w',
+            ],
+            2 => [
+                'pipe',
+                'w',
+            ],
+        ];
+
+        $process = proc_open($command, $descriptors, $pipes);
+
+        if (!is_resource($process)) {
+            return false;
+        }
+
+        stream_set_blocking($pipes[1], 0);
+
+        stream_set_blocking($pipes[2], 0);
+
+        if (!$timeout) {
+            $timeout = 5;
+        }
+
+        $real_timeout = ($timeout * 1000000);
+
+        $buffer = '';
+
+        while ($real_timeout > 0) {
+            $start = microtime(true);
+
+            $read  = [$pipes[1]];
+            $other = [];
+            stream_select($read, $other, $other, 0, $real_timeout);
+
+            $status = proc_get_status($process);
+
+            $buffer .= stream_get_contents($pipes[1]);
+
+            if ($status['running'] === false) {
+                break;
+            }
+
+            $real_timeout -= ((microtime(true) - $start) * 1000000);
+        }
+
+        if ($real_timeout <= 0) {
+            proc_terminate($process, 9);
+
+            fclose($pipes[0]);
+            fclose($pipes[1]);
+            fclose($pipes[2]);
+
+            proc_close($process);
+
+            return false;
+        }
+
+        $errors = stream_get_contents($pipes[2]);
+
+        if (empty($errors) === false && empty($buffer)) {
+            proc_terminate($process, 9);
+
+            fclose($pipes[0]);
+            fclose($pipes[1]);
+            fclose($pipes[2]);
+
+            proc_close($process);
+
+            return false;
+        }
+
+        proc_terminate($process, 9);
+
+        fclose($pipes[0]);
+        fclose($pipes[1]);
+        fclose($pipes[2]);
+
+        proc_close($process);
+
+        return $buffer;
+    }
+
+
+}
diff --git a/pandora_console/include/class/SatelliteAgent.class.php b/pandora_console/include/class/SatelliteAgent.class.php
index 31cd2550d9..29fa2e3b77 100644
--- a/pandora_console/include/class/SatelliteAgent.class.php
+++ b/pandora_console/include/class/SatelliteAgent.class.php
@@ -162,7 +162,7 @@ class SatelliteAgent extends HTML
                 [
                     'id'                  => $this->tableId,
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => $this->ajaxController,
diff --git a/pandora_console/include/class/SatelliteCollection.class.php b/pandora_console/include/class/SatelliteCollection.class.php
index 8af5f210c8..a1ef24393c 100644
--- a/pandora_console/include/class/SatelliteCollection.class.php
+++ b/pandora_console/include/class/SatelliteCollection.class.php
@@ -142,7 +142,7 @@ class SatelliteCollection extends HTML
                 [
                     'id'                  => $this->tableId,
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => $this->ajaxController,
diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index e613ab57bf..4a2c32de2e 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -326,7 +326,7 @@ class SnmpConsole extends HTML
                 [
                     'id'                  => $tableId,
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => $this->ajaxController,
@@ -519,6 +519,8 @@ class SnmpConsole extends HTML
         $legend .= '</div>';
         $legend .= '</div></div></td>';
 
+        echo '<br>';
+
         ui_toggle($legend, __('Legend'));
 
         // Load own javascript file.
@@ -1331,17 +1333,8 @@ class SnmpConsole extends HTML
              *   Show more information
              */
             function toggleVisibleExtendedInfo(id, position) {
-                // Show all "Show more"
-                $('[id^=img_]').each(function() {
-                    $(this).show();
-                });
-                // Hide all "Hide details"
-                $('[id^=img_hide_]').each(function() {
-                    $(this).hide();
-                });
                 var status = $('#eye_'+id).attr('data-show');
                 if(status == "show"){
-                    $('tr[id^=show_]').remove()
                     $.ajax({
                         method: 'get',
                         url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
@@ -1360,14 +1353,14 @@ class SnmpConsole extends HTML
                         datatype: "json",
                         success: function(data) {
                             let trap = JSON.parse(data);
-                            var tr = $('#snmp_console tr').eq(position+1);
+                            var tr = $('#snmp_console tr:not([id^="show_"])').eq(position+1);
 
                             // Count.
                             if ($('#filter_group_by').val() == 1) {
                                 let labelCount = '<td align="left" valign="top"><b><?php echo __('Count:'); ?></b></br><b><?php echo __('First trap:'); ?></b></br><b><?php echo __('Last trap:'); ?></td>';
                                 let variableCount = `<td align="left" valign="top" style="line-height: 16pt">${trap['count']}</br>${trap['first']}</br>${trap['last']}</td>`;
 
-                                tr.after(`<tr id="show_" role="row">${labelCount}${variableCount}</tr>`);
+                                tr.after(`<tr id="show_${id}" role="row">${labelCount}${variableCount}</tr>`);
                             }
 
                             // Type.
@@ -1405,27 +1398,27 @@ class SnmpConsole extends HTML
                             let labelType = '<td align="left" valign="top"><b><?php echo __('Type:'); ?></td>';
                             let variableType = `<td align="left" colspan="8">${desc_trap_type}</td>`;
 
-                            tr.after(`<tr id="show_" role="row">${labelType}${variableType}</tr>`);
+                            tr.after(`<tr id="show_${id}" role="row">${labelType}${variableType}</tr>`);
 
                             // Description.
                             if (trap['description']) {
                                 let labelDesc = '<td align="left" valign="top"><b><?php echo __('Description:'); ?></td>';
                                 let variableDesc = `<td align="left" colspan="8">${trap['description']}</td>`;
 
-                                tr.after(`<tr id="show_" role="row">${labelDesc}${variableDesc}</tr>`);
+                                tr.after(`<tr id="show_${id}" role="row">${labelDesc}${variableDesc}</tr>`);
                             }
 
                             // Enterprise String.
                             let labelOid = '<td align="left" valign="top"><b><?php echo __('Enterprise String:'); ?></td>';
                             let variableOId = `<td align="left" colspan="8">${trap['oid']}</td>`;
 
-                            tr.after(`<tr id="show_" role="row">${labelOid}${variableOId}</tr>`);
+                            tr.after(`<tr id="show_${id}" role="row">${labelOid}${variableOId}</tr>`);
 
                             // Variable bindings.
                             let labelBindings = '';
                             let variableBindings = '';
                             if ($('#filter_group_by').val() == 1) {
-                                labelBindings = '<td align="left" valign="top" width="15%"><b><?php echo __('Variable bindings:'); ?></b></td>';
+                                labelBindings = '<td align="left" valign="top" ><b><?php echo __('Variable bindings:'); ?></b></td>';
 
                                 let new_url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view';
                                 new_url += '&filter_severity='+$('#filter_severity').val();
@@ -1439,7 +1432,7 @@ class SnmpConsole extends HTML
 
                                 variableBindings = `<td align="left" colspan="8">${string}</td>`;
                             } else {
-                                labelBindings = '<td align="left" valign="top" width="15%"><b><?php echo __('Variable bindings:'); ?></b></td>';
+                                labelBindings = '<td align="left" valign="top" ><b><?php echo __('Variable bindings:'); ?></b></td>';
                                 const binding_vars = trap['oid_custom'].split("\t");
                                 let string = '';
                                 binding_vars.forEach(function(oid) {
@@ -1448,7 +1441,7 @@ class SnmpConsole extends HTML
                                 variableBindings = `<td align="left" colspan="8" class="break-word w200px">${string}</td>`;
                             }
 
-                            tr.after(`<tr id="show_" role="row">${labelBindings}${variableBindings}</tr>`);
+                            tr.after(`<tr id="show_${id}" role="row">${labelBindings}${variableBindings}</tr>`);
                         },
                         error: function(e) {
                             console.error(e);
@@ -1458,7 +1451,7 @@ class SnmpConsole extends HTML
                     $('#img_'+id).hide();
                     $('#img_hide_'+id).show();
                 } else{
-                    $('tr[id^=show_]').remove();
+                    $(`tr#show_${id}`).remove();
                     $('#eye_'+id).attr('data-show', 'show');
                     $('#img_'+id).show();
                     $('#img_hide_'+id).hide();
diff --git a/pandora_console/include/class/TipsWindow.class.php b/pandora_console/include/class/TipsWindow.class.php
index cf0824f626..ae4271fba9 100644
--- a/pandora_console/include/class/TipsWindow.class.php
+++ b/pandora_console/include/class/TipsWindow.class.php
@@ -475,7 +475,7 @@ class TipsWindow
                 [
                     'id'                  => 'list_tips_windows',
                     'class'               => 'info_table',
-                    'style'               => 'width: 99%',
+                    'style'               => 'width: 100%',
                     'dom_elements'        => 'lpfti',
                     'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar',
                     'columns'             => $columns,
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 99d33b658e..e95ec7ae0f 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 = 'PC230720';
+$build_version = 'PC230731';
 $pandora_version = 'v7.0NG.772';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index 64260179ce..e8d4eb3a4f 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -648,6 +648,7 @@ define('DISCOVERY_APP_DB2', 11);
 define('DISCOVERY_APP_MICROSOFT_SQL_SERVER', 12);
 define('DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE', 13);
 define('DISCOVERY_CLOUD_AWS_S3', 14);
+define('DISCOVERY_EXTENSION', 15);
 
 // Force task build tmp results.
 define('DISCOVERY_REVIEW', 0);
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index ee4ee7d1ab..e8f0ac3452 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -907,7 +907,7 @@ function set_cookie($name, $value)
 {
     if (is_null($value)) {
         unset($_COOKIE[$value]);
-        setcookie($name, null, -1, '/');
+        setcookie($name, '', -1, '/');
     } else {
         setcookie($name, $value);
     }
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 16b0372f74..2a21bed3a6 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -13102,9 +13102,14 @@ function api_set_create_event($id, $trash1, $other, $returnType)
             $values['custom_data'] = '';
         }
 
+        $ack_utimestamp = 0;
+
         if ($other['data'][18] != '') {
             $values['id_extra'] = $other['data'][18];
-            $sql_validation = 'SELECT id_evento,estado FROM tevento where estado IN (0,2) and id_extra ="'.$other['data'][18].'";';
+            $sql_validation = 'SELECT id_evento,estado,ack_utimestamp,id_usuario
+                FROM tevento
+                WHERE estado IN (0,2) AND id_extra ="'.$other['data'][18].'";';
+
             $validation = db_get_all_rows_sql($sql_validation);
 
             if ($validation) {
@@ -13114,8 +13119,10 @@ function api_set_create_event($id, $trash1, $other, $returnType)
                         && (int) $values['status'] === 0
                     ) {
                         $values['status'] = 2;
+                        $ack_utimestamp = $val['ack_utimestamp'];
+                        $values['id_usuario'] = $val['id_usuario'];
                     }
-
+                    
                     api_set_validate_event_by_id($val['id_evento']);
                 }
             }
@@ -13143,7 +13150,8 @@ function api_set_create_event($id, $trash1, $other, $returnType)
             $values['tags'],
             $custom_data,
             $values['server_id'],
-            $values['id_extra']
+            $values['id_extra'],
+            $ack_utimestamp
         );
 
         if ($other['data'][12] != '') {
@@ -15755,6 +15763,8 @@ function api_get_cluster_items($cluster_id)
  */
 function api_set_create_event_filter($name, $thrash1, $other, $thrash3)
 {
+    global $config;
+
     if ($name == '') {
         returnError(
             'The event filter could not be created. Event filter name cannot be left blank.'
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index d1de857ae9..afc0b41017 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -378,6 +378,10 @@ function config_update_config()
                         $error_update[] = __('keep_in_process_status_extra_id');
                     }
 
+                    if (config_update_value('show_experimental_features', get_parameter('show_experimental_features'), true) === false) {
+                        $error_update[] = __('show_experimental_features');
+                    }
+
                     if (config_update_value('console_log_enabled', get_parameter('console_log_enabled'), true) === false) {
                         $error_update[] = __('Console log enabled');
                     }
@@ -398,6 +402,10 @@ function config_update_config()
                         $error_update[] = __('Check conexion interval');
                     }
 
+                    if (config_update_value('max_hours_old_event_comment', get_parameter('max_hours_old_event_comment'), true) === false) {
+                        $error_update[] = __('Max hours old event comments');
+                    }
+
                     if (config_update_value('unique_ip', get_parameter('unique_ip'), true) === false) {
                         $error_update[] = __('Unique IP');
                     }
@@ -970,12 +978,12 @@ function config_update_config()
                         }
                     }
 
-                    if (config_update_value('delete_old_messages', get_parameter('delete_old_messages'), true) === false) {
-                        $error_update[] = __('Max. days before delete old messages');
+                    if (config_update_value('delete_disabled_agents', get_parameter('delete_disabled_agents'), true) === false) {
+                        $error_update[] = __('Max. days before disabled agents are deleted');
                     }
 
-                    if (config_update_value('delete_old_network_matrix', get_parameter('delete_old_network_matrix'), true) === false) {
-                        $error_update[] = __('Max. days before delete old network matrix data');
+                    if (config_update_value('delete_old_messages', get_parameter('delete_old_messages'), true) === false) {
+                        $error_update[] = __('Max. days before delete old messages');
                     }
 
                     if (config_update_value('max_graph_container', get_parameter('max_graph_container'), true) === false) {
@@ -2231,12 +2239,12 @@ function config_process_config()
         }
     }
 
-    if (!isset($config['delete_old_messages'])) {
-        config_update_value('delete_old_messages', 21);
+    if (!isset($config['delete_disabled_agents'])) {
+        config_update_value('delete_disabled_agents', 0);
     }
 
-    if (!isset($config['delete_old_network_matrix'])) {
-        config_update_value('delete_old_network_matrix', 10);
+    if (!isset($config['delete_old_messages'])) {
+        config_update_value('delete_old_messages', 21);
     }
 
     if (!isset($config['max_graph_container'])) {
@@ -2401,6 +2409,10 @@ function config_process_config()
         config_update_value('keep_in_process_status_extra_id', 0);
     }
 
+    if (!isset($config['show_experimental_features'])) {
+        config_update_value('show_experimental_features', 0);
+    }
+
     if (!isset($config['console_log_enabled'])) {
         config_update_value('console_log_enabled', 0);
     }
@@ -2421,6 +2433,10 @@ function config_process_config()
         config_update_value('check_conexion_interval', 180);
     }
 
+    if (!isset($config['max_hours_old_event_comment'])) {
+        config_update_value('max_hours_old_event_comment', 8);
+    }
+
     if (!isset($config['elasticsearch_ip'])) {
         config_update_value('elasticsearch_ip', '');
     }
@@ -2502,10 +2518,6 @@ function config_process_config()
                         'max' => 90,
                         'min' => 0,
                     ],
-                    'delete_old_network_matrix'        => [
-                        'max' => 30,
-                        'min' => 1,
-                    ],
                     'report_limit'                     => [
                         'max' => 500,
                         'min' => 1,
@@ -3471,10 +3483,6 @@ function config_process_config()
         config_update_value('dbtype', 'mysql');
     }
 
-    if (!isset($config['legacy_vc'])) {
-        config_update_value('legacy_vc', 0);
-    }
-
     if (!isset($config['vc_default_cache_expiration'])) {
         config_update_value('vc_default_cache_expiration', 60);
     }
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index d03329964e..4f70579caf 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -613,6 +613,74 @@ function events_update_status($id_evento, $status, $filter=null)
 }
 
 
+/**
+ * Get filter time.
+ *
+ * @param array $filter Filters.
+ *
+ * @return array conditions.
+ */
+function get_filter_date(array $filter)
+{
+    if (isset($filter['date_from']) === true
+        && empty($filter['date_from']) === false
+        && $filter['date_from'] !== '0000-00-00'
+    ) {
+        $date_from = $filter['date_from'];
+    }
+
+    if (isset($filter['time_from']) === true) {
+        $time_from = (empty($filter['time_from']) === true) ? '00:00:00' : $filter['time_from'];
+    }
+
+    if (isset($date_from) === true) {
+        if (isset($time_from) === false) {
+            $time_from = '00:00:00';
+        }
+
+        $from = $date_from.' '.$time_from;
+        $sql_filters[] = sprintf(
+            ' AND te.utimestamp >= %d',
+            strtotime($from)
+        );
+    }
+
+    if (isset($filter['date_to']) === true
+        && empty($filter['date_to']) === false
+        && $filter['date_to'] !== '0000-00-00'
+    ) {
+        $date_to = $filter['date_to'];
+    }
+
+    if (isset($filter['time_to']) === true) {
+        $time_to = (empty($filter['time_to']) === true) ? '23:59:59' : $filter['time_to'];
+    }
+
+    if (isset($date_to) === true) {
+        if (isset($time_to) === false) {
+            $time_to = '23:59:59';
+        }
+
+        $to = $date_to.' '.$time_to;
+        $sql_filters[] = sprintf(
+            ' AND te.utimestamp <= %d',
+            strtotime($to)
+        );
+    }
+
+    if (isset($from) === false) {
+        if (isset($filter['event_view_hr']) === true && ($filter['event_view_hr'] > 0)) {
+            $sql_filters[] = sprintf(
+                ' AND te.utimestamp > UNIX_TIMESTAMP(now() - INTERVAL %d HOUR) ',
+                $filter['event_view_hr']
+            );
+        }
+    }
+
+    return $sql_filters;
+}
+
+
 /**
  * Retrieve all events filtered.
  *
@@ -700,60 +768,7 @@ function events_get_all(
         );
     }
 
-    if (isset($filter['date_from']) === true
-        && empty($filter['date_from']) === false
-        && $filter['date_from'] !== '0000-00-00'
-    ) {
-        $date_from = $filter['date_from'];
-    }
-
-    if (isset($filter['time_from']) === true) {
-        $time_from = (empty($filter['time_from']) === true) ? '00:00:00' : $filter['time_from'];
-    }
-
-    if (isset($date_from) === true) {
-        if (isset($time_from) === false) {
-            $time_from = '00:00:00';
-        }
-
-        $from = $date_from.' '.$time_from;
-        $sql_filters[] = sprintf(
-            ' AND te.utimestamp >= %d',
-            strtotime($from)
-        );
-    }
-
-    if (isset($filter['date_to']) === true
-        && empty($filter['date_to']) === false
-        && $filter['date_to'] !== '0000-00-00'
-    ) {
-        $date_to = $filter['date_to'];
-    }
-
-    if (isset($filter['time_to']) === true) {
-        $time_to = (empty($filter['time_to']) === true) ? '23:59:59' : $filter['time_to'];
-    }
-
-    if (isset($date_to) === true) {
-        if (isset($time_to) === false) {
-            $time_to = '23:59:59';
-        }
-
-        $to = $date_to.' '.$time_to;
-        $sql_filters[] = sprintf(
-            ' AND te.utimestamp <= %d',
-            strtotime($to)
-        );
-    }
-
-    if (isset($from) === false) {
-        if (isset($filter['event_view_hr']) === true && ($filter['event_view_hr'] > 0)) {
-            $sql_filters[] = sprintf(
-                ' AND utimestamp > UNIX_TIMESTAMP(now() - INTERVAL %d HOUR) ',
-                $filter['event_view_hr']
-            );
-        }
-    }
+    $sql_filters = get_filter_date($filter);
 
     if (isset($filter['id_agent']) === true && $filter['id_agent'] > 0) {
         $sql_filters[] = sprintf(
@@ -1069,7 +1084,6 @@ function events_get_all(
         $array_search = [
             'te.id_evento',
             'lower(te.evento)',
-            'lower(te.user_comment)',
             'lower(te.id_extra)',
             'lower(te.source)',
             'lower('.$custom_data_search.')',
@@ -1106,7 +1120,6 @@ function events_get_all(
             ' AND (lower(ta.alias) not like lower("%%%s%%")
                 AND te.id_evento not like "%%%s%%"
                 AND lower(te.evento) not like lower("%%%s%%")
-                AND lower(te.user_comment) not like lower("%%%s%%")
                 AND lower(te.id_extra) not like lower("%%%s%%")
                 AND lower(te.source) not like lower("%%%s%%") )',
             array_fill(0, 6, $filter['search_exclude'])
@@ -1122,16 +1135,13 @@ function events_get_all(
     }
 
     // User comment.
+    $event_comment_join = '';
     if (empty($filter['user_comment']) === false) {
-        // For filter field.
+        $event_comment_join = 'INNER JOIN tevent_comment ON te.id_evento = tevent_comment.id_event';
         $sql_filters[] = sprintf(
-            ' AND lower(te.user_comment) like lower("%%%s%%") ',
-            io_safe_input($filter['user_comment'])
-        );
-
-        // For show comments on event details.
-        $sql_filters[] = sprintf(
-            ' OR lower(te.user_comment) like lower("%%%s%%") ',
+            ' AND (lower(tevent_comment.comment) like lower("%%%s%%")
+                OR lower(tevent_comment.comment) like lower("%%%s%%"))',
+            io_safe_input($filter['user_comment']),
             $filter['user_comment']
         );
     }
@@ -1455,7 +1465,7 @@ function events_get_all(
             ' LIMIT  %d',
             $config['max_number_of_events_per_node']
         );
-    } else if (isset($limit, $offset) === true && $limit > 0) {
+    } else if (isset($limit, $offset) === true && empty($limit) === false && $limit > 0) {
         $pagination = sprintf(' LIMIT %d OFFSET %d', $limit, $offset);
     }
 
@@ -1552,36 +1562,20 @@ function events_get_all(
     $group_selects = '';
     if ($group_by != '') {
         if ($count === false) {
-            $idx = array_search('te.user_comment', $fields);
-            if ($idx !== false) {
-                unset($fields[$idx]);
-            }
-
-            db_process_sql('SET group_concat_max_len = 9999999');
-
             $group_selects = sprintf(
                 ',COUNT(id_evento) AS event_rep,
-                %s
-                MAX(utimestamp) as timestamp_last,
-                MIN(utimestamp) as timestamp_first,
-                MAX(id_evento) as max_id_evento',
-                ($idx !== false) ? 'GROUP_CONCAT(DISTINCT user_comment SEPARATOR "<br>") AS comments,' : ''
+                MAX(te.utimestamp) as timestamp_last,
+                MIN(te.utimestamp) as timestamp_first,
+                MAX(id_evento) as max_id_evento'
             );
 
             $group_selects_trans = sprintf(
                 ',tmax_event.event_rep,
-                %s
                 tmax_event.timestamp_last,
                 tmax_event.timestamp_first,
-                tmax_event.max_id_evento',
-                ($idx !== false) ? 'tmax_event.comments,' : ''
+                tmax_event.max_id_evento'
             );
         }
-    } else {
-        $idx = array_search('te.user_comment', $fields);
-        if ($idx !== false) {
-            $fields[$idx] = 'te.user_comment AS comments';
-        }
     }
 
     if (((int) $filter['group_rep'] === EVENT_GROUP_REP_EVENTS
@@ -1596,11 +1590,12 @@ function events_get_all(
                 FROM %s
                 %s
                 %s
+                %s
                 %s JOIN %s ta
-                ON ta.%s = te.id_agente
+                    ON ta.%s = te.id_agente
                 %s
                 %s JOIN tgrupo tg
-                ON %s
+                    ON %s
                 WHERE 1=1
                 %s
                 %s
@@ -1611,6 +1606,7 @@ function events_get_all(
             ON te.id_evento = tmax_event.max_id_evento
             %s
             %s
+            %s
             %s JOIN %s ta
                 ON ta.%s = te.id_agente
             %s
@@ -1625,6 +1621,7 @@ function events_get_all(
             $tevento,
             $event_lj,
             $agentmodule_join,
+            $event_comment_join,
             $tagente_join,
             $tagente_table,
             $tagente_field,
@@ -1638,6 +1635,7 @@ function events_get_all(
             $having,
             $event_lj,
             $agentmodule_join,
+            $event_comment_join,
             $tagente_join,
             $tagente_table,
             $tagente_field,
@@ -1654,6 +1652,7 @@ function events_get_all(
             FROM %s
             %s
             %s
+            %s
             %s JOIN %s ta
             ON ta.%s = te.id_agente
             %s
@@ -1671,6 +1670,7 @@ function events_get_all(
             $tevento,
             $event_lj,
             $agentmodule_join,
+            $event_comment_join,
             $tagente_join,
             $tagente_table,
             $tagente_field,
@@ -2240,91 +2240,18 @@ function events_comment(
         $first_event = reset($id_event);
     }
 
-    $sql = sprintf(
-        'SELECT user_comment
-        FROM tevento
-        WHERE id_evento = %d',
-        $first_event
+    // Update comment.
+    $ret = db_process_sql_insert(
+        'tevent_comment',
+        [
+            'id_event'   => $first_event,
+            'comment'    => $comment,
+            'action'     => $action,
+            'utimestamp' => time(),
+            'id_user'    => $config['id_user'],
+        ],
     );
 
-    $event_comments = db_get_all_rows_sql($sql);
-    $event_comments_array = [];
-
-    if ($event_comments[0]['user_comment'] == '') {
-        $comments_format = 'new';
-    } else {
-        // If comments are not stored in json, the format is old.
-        $event_comments[0]['user_comment'] = str_replace(
-            [
-                "\n",
-                '&#x0a;',
-            ],
-            '<br>',
-            $event_comments[0]['user_comment']
-        );
-        $event_comments_array = json_decode($event_comments[0]['user_comment']);
-
-        if (empty($event_comments_array) === true) {
-            $comments_format = 'old';
-        } else {
-            $comments_format = 'new';
-        }
-    }
-
-    switch ($comments_format) {
-        case 'new':
-            $comment_for_json['comment'] = io_safe_input($comment);
-            $comment_for_json['action'] = $action;
-            $comment_for_json['id_user'] = $config['id_user'];
-            $comment_for_json['utimestamp'] = time();
-            $comment_for_json['event_id'] = $first_event;
-
-            $event_comments_array[] = $comment_for_json;
-
-            $event_comments = io_json_mb_encode($event_comments_array);
-
-            // Update comment.
-            $ret = db_process_sql_update(
-                'tevento',
-                ['user_comment' => $event_comments],
-                ['id_evento' => implode(',', $id_event)]
-            );
-        break;
-
-        case 'old':
-            // Give old ugly format to comment.
-            // Change this method for aux table or json.
-            $comment = str_replace(["\r\n", "\r", "\n"], '<br>', $comment);
-
-            if ($comment !== '') {
-                $commentbox = '<div class="comment_box">'.io_safe_input($comment).'</div>';
-            } else {
-                $commentbox = '';
-            }
-
-            // Don't translate 'by' word because if multiple users with
-            // different languages make comments in the same console
-            // will be a mess.
-            $comment = '<b>-- '.$action.' by '.$config['id_user'].' ['.date($config['date_format']).'] --</b><br>'.$commentbox.'<br>';
-
-            // Update comment.
-            $sql_validation = sprintf(
-                'UPDATE %s
-                SET user_comment = concat("%s", user_comment)
-                WHERE id_evento in (%s)',
-                'tevento',
-                $comment,
-                implode(',', $id_event)
-            );
-
-            $ret = db_process_sql($sql_validation);
-        break;
-
-        default:
-            // Ignore.
-        break;
-    }
-
     if (($ret === false) || ($ret === 0)) {
         return false;
     }
@@ -2409,7 +2336,8 @@ function events_create_event(
     $tags='',
     $custom_data='',
     $server_id=0,
-    $id_extra=''
+    $id_extra='',
+    $ack_utimestamp=0
 ) {
     if ($source === false) {
         $source = get_product_name();
@@ -2430,7 +2358,6 @@ function events_create_event(
         'id_agentmodule'        => $id_agent_module,
         'id_alert_am'           => $id_aam,
         'criticity'             => $priority,
-        'user_comment'          => '',
         'tags'                  => $tags,
         'source'                => $source,
         'id_extra'              => $id_extra,
@@ -2438,7 +2365,7 @@ function events_create_event(
         'warning_instructions'  => $warning_instructions,
         'unknown_instructions'  => $unknown_instructions,
         'owner_user'            => '',
-        'ack_utimestamp'        => 0,
+        'ack_utimestamp'        => $ack_utimestamp,
         'custom_data'           => $custom_data,
         'data'                  => '',
         'module_status'         => 0,
@@ -5061,8 +4988,12 @@ function events_page_general($event)
         }
 
         $data[1] = $user_ack.'&nbsp;(&nbsp;';
+        // hd($config['date_format'], true);
+        // hd($event['ack_utimestamp_raw'], true);
+        // TODO: mirar en el manage y en la api que este ack de venir vacio lo herede del anterior que hubiera.
         if ($event['ack_utimestamp_raw'] !== false
             && $event['ack_utimestamp_raw'] !== 'false'
+            && empty($event['ack_utimestamp_raw']) === false
         ) {
             $data[1] .= date(
                 $config['date_format'],
@@ -5218,7 +5149,7 @@ function events_page_general_acknowledged($event_id)
  *
  * @return string HTML.
  */
-function events_page_comments($event, $ajax=false, $groupedComments=[])
+function events_page_comments($event, $groupedComments=[], $filter=null)
 {
     // Comments.
     global $config;
@@ -5229,12 +5160,7 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
     $table_comments->head = [];
     $table_comments->class = 'table_modal_alternate';
 
-    if (isset($event['user_comment']) === false) {
-        $event['user_comment'] = '';
-    }
-
-    $comments = (empty($groupedComments) === true) ? $event['user_comment'] : $groupedComments;
-
+    $comments = $groupedComments;
     if (empty($comments) === true) {
         $table_comments->style[0] = 'text-align:left;';
         $table_comments->colspan[0][0] = 2;
@@ -5243,49 +5169,7 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
         $table_comments->data[] = $data;
     } else {
         if (is_array($comments) === true) {
-            $comments_array = [];
-            foreach ($comments as $comm) {
-                if (empty($comm) === true) {
-                    continue;
-                }
-
-                // If exists user_comments, come from grouped events and must be handled like this.
-                if (isset($comm['user_comment']) === true) {
-                    $comm = $comm['user_comment'];
-                }
-
-                $comm = str_replace(["\n", '&#x0a;'], '<br>', $comm);
-
-                $comments_array[] = io_safe_output(json_decode($comm, true));
-            }
-
-            // Plain comments. Can be improved.
-            $sortedCommentsArray = [];
-            foreach ($comments_array as $comm) {
-                if (isset($comm) === true
-                    && empty($comm) === false
-                ) {
-                    foreach ($comm as $subComm) {
-                        $sortedCommentsArray[] = $subComm;
-                    }
-                }
-            }
-
-            // Sorting the comments by utimestamp (newer is first).
-            usort(
-                $sortedCommentsArray,
-                function ($a, $b) {
-                    if ($a['utimestamp'] == $b['utimestamp']) {
-                        return 0;
-                    }
-
-                    return ($a['utimestamp'] > $b['utimestamp']) ? -1 : 1;
-                }
-            );
-
-            // Clean the unsorted comments and return it to the original array.
-            $comments_array = [];
-            $comments_array[] = $sortedCommentsArray;
+            $comments_array = $comments;
         } else {
             $comments = str_replace(["\n", '&#x0a;'], '<br>', $comments);
             // If comments are not stored in json, the format is old.
@@ -5293,76 +5177,70 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
         }
 
         foreach ($comments_array as $comm) {
-            $comments_format = (empty($comm) === true && is_array($comments) === false) ? 'old' : 'new';
+            $eventIdExplanation = (empty($groupedComments) === false) ? sprintf(' (#%d)', $comm['id_event']) : '';
+            $data[0] = sprintf(
+                '<b>%s %s %s%s</b>',
+                $comm['action'],
+                __('by'),
+                get_user_fullname(io_safe_input($comm['id_user'])).' ('.io_safe_input($comm['id_user']).')',
+                $eventIdExplanation
+            );
 
-            switch ($comments_format) {
-                case 'new':
-                    foreach ($comm as $c) {
-                        $eventIdExplanation = (empty($groupedComments) === false) ? sprintf(' (#%d)', $c['event_id']) : '';
+            $data[0] .= sprintf(
+                '<br><br><i>%s</i>',
+                date($config['date_format'], $comm['utimestamp'])
+            );
 
-                        $data[0] = sprintf(
-                            '<b>%s %s %s%s</b>',
-                            $c['action'],
-                            __('by'),
-                            get_user_fullname(io_safe_input($c['id_user'])).' ('.io_safe_input($c['id_user']).')',
-                            $eventIdExplanation
-                        );
+            $data[1] = '<p class="break_word">'.stripslashes(str_replace(['\n', '\r'], '<br/>', $comm['comment'])).'</p>';
 
-                        $data[0] .= sprintf(
-                            '<br><br><i>%s</i>',
-                            date($config['date_format'], $c['utimestamp'])
-                        );
-
-                        $data[1] = '<p class="break_word">'.stripslashes(str_replace(['\n', '\r'], '<br/>', $c['comment'])).'</p>';
-
-                        $table_comments->data[] = $data;
-                    }
-                break;
-
-                case 'old':
-                    $comm = explode('<br>', $comments);
-
-                    // Split comments and put in table.
-                    $col = 0;
-                    $data = [];
-
-                    foreach ($comm as $c) {
-                        switch ($col) {
-                            case 0:
-                                $row_text = preg_replace('/\s*--\s*/', '', $c);
-                                $row_text = preg_replace('/\<\/b\>/', '</i>', $row_text);
-                                $row_text = preg_replace('/\[/', '</b><br><br><i>[', $row_text);
-                                $row_text = preg_replace('/[\[|\]]/', '', $row_text);
-                            break;
-
-                            case 1:
-                                $row_text = preg_replace("/[\r\n|\r|\n]/", '<br>', io_safe_output(strip_tags($c)));
-                            break;
-
-                            default:
-                                // Ignore.
-                            break;
-                        }
-
-                        $data[$col] = $row_text;
-
-                        $col++;
-
-                        if ($col == 2) {
-                            $col = 0;
-                            $table_comments->data[] = $data;
-                            $data = [];
-                        }
-                    }
-                break;
-
-                default:
-                    // Ignore.
-                break;
-            }
+            $table_comments->data[] = $data;
         }
     }
 
+    $comments_filter = '<div class="flex align-center">';
+    $comments_filter .= html_print_label_input_block(
+        null,
+        html_print_extended_select_for_time(
+            'comments_events_max_hours_old',
+            $filter['event_view_hr_cs'],
+            '',
+            __('Default'),
+            -2,
+            false,
+            true,
+            false,
+            true,
+            '',
+            false,
+            [
+                SECONDS_1HOUR   => __('1 hour'),
+                SECONDS_6HOURS  => __('6 hours'),
+                SECONDS_12HOURS => __('12 hours'),
+                SECONDS_1DAY    => __('24 hours'),
+                SECONDS_2DAY    => __('48 hours'),
+            ],
+            '',
+            false,
+            0,
+            [ SECONDS_1HOUR => __('hours') ],
+        )
+    );
+
+    $eventb64 = base64_encode(json_encode($event));
+    $filterb64 = base64_encode(json_encode($filter));
+    $comments_filter .= html_print_submit_button(
+        __('Filter'),
+        'filter_comments_button',
+        false,
+        [
+            'class'   => 'mini mrgn_lft_15px',
+            'icon'    => 'search',
+            'onclick' => 'get_table_events_tabs("'.$eventb64.'","'.$filterb64.'")',
+        ],
+        true
+    );
+    $comments_filter .= '</div>';
+
     if (((tags_checks_event_acl(
         $config['id_user'],
         $event['id_grupo'],
@@ -5388,7 +5266,10 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
             true
         );
 
-        $comments_form .= '<br><div class="right mrgn_top_10px">';
+        $comments_form .= '<br>';
+        $comments_form .= '<div class="mrgn_top_10px container-filter-buttons">';
+        $comments_form .= $comments_filter;
+        $comments_form .= '<div>';
         $comments_form .= html_print_button(
             __('Add comment'),
             'comment_button',
@@ -5400,14 +5281,15 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
             ],
             true
         );
-        $comments_form .= '</div><br></div>';
+        $comments_form .= '</div>';
+        $comments_form .= '</div>';
+
+        $comments_form .= '<br></div>';
+    } else {
+        $comments_form = $comments_filter;
     }
 
-    if ($ajax === true) {
-        return $comments_form.html_print_table($table_comments, true);
-    }
-
-    return '<div id="extended_event_comments_page" class="extended_event_pages">'.$comments_form.html_print_table($table_comments, true).'</div>';
+    return $comments_form.html_print_table($table_comments, true);
 }
 
 
@@ -5542,7 +5424,7 @@ function events_get_sql_order($sort_field='timestamp', $sort='DESC', $group_rep=
         break;
 
         case 'comment':
-            $sort_field_translated = 'user_comment';
+            $sort_field_translated = 'tevent_comment.comment';
         break;
 
         case 'extra_id':
@@ -6114,3 +5996,179 @@ function get_count_event_criticity(
 
     return db_get_all_rows_sql($sql_meta);
 }
+
+
+/**
+ * Comments for this events.
+ *
+ * @param array   $event     Info event.
+ * @param integer $mode      Mode group by.
+ * @param integer $event_rep Events.
+ *
+ * @return array Comments.
+ */
+function event_get_comment($event, $filter=null)
+{
+    $whereGrouped = [];
+    if (empty($filter) === false) {
+        if (isset($filter['event_view_hr_cs']) === true && ($filter['event_view_hr_cs'] > 0)) {
+            $whereGrouped[] = sprintf(
+                ' AND tevent_comment.utimestamp > UNIX_TIMESTAMP(now() - INTERVAL %d SECOND) ',
+                $filter['event_view_hr_cs']
+            );
+        } else if (isset($filter['event_view_hr']) === true && ($filter['event_view_hr'] > 0)) {
+            $whereGrouped[] = sprintf(
+                ' AND tevent_comment.utimestamp > UNIX_TIMESTAMP(now() - INTERVAL %d SECOND) ',
+                ((int) $filter['event_view_hr'] * 3600)
+            );
+        }
+    }
+
+    $mode = (int) $filter['group_rep'];
+
+    $eventsGrouped = [];
+    // Consider if the event is grouped.
+    if ($mode === EVENT_GROUP_REP_EVENTS) {
+        // Default grouped message filtering (evento and estado).
+        $whereGrouped[] = sprintf(
+            'AND `tevento`.`evento` = "%s"',
+            io_safe_input(io_safe_output($event['evento']))
+        );
+
+        // If id_agente is reported, filter the messages by them as well.
+        if ((int) $event['id_agente'] > 0) {
+            $whereGrouped[] = sprintf(
+                ' AND `tevento`.`id_agente` = %d',
+                (int) $event['id_agente']
+            );
+        }
+
+        if ((int) $event['id_agentmodule'] > 0) {
+            $whereGrouped[] = sprintf(
+                ' AND `tevento`.`id_agentmodule` = %d',
+                (int) $event['id_agentmodule']
+            );
+        }
+    } else if ($mode === EVENT_GROUP_REP_EXTRAIDS) {
+        $whereGrouped[] = sprintf(
+            'AND `tevento`.`id_extra` = "%s"',
+            io_safe_input(io_safe_output($event['id_extra']))
+        );
+    } else {
+        $whereGrouped[] = sprintf('AND `tevento`.`id_evento` = %d', $event['id_evento']);
+    }
+
+    try {
+        if (is_metaconsole() === true
+            && $event['server_id'] > 0
+        ) {
+            $node = new Node($event['server_id']);
+            $node->connect();
+        }
+
+        $sql = sprintf(
+            'SELECT tevent_comment.*
+            FROM tevento
+            INNER JOIN tevent_comment
+                ON tevento.id_evento = tevent_comment.id_event
+            WHERE 1=1 %s
+            ORDER BY tevent_comment.utimestamp DESC',
+            implode(' ', $whereGrouped)
+        );
+
+        // Get grouped comments.
+        $eventsGrouped = db_get_all_rows_sql($sql);
+    } catch (\Exception $e) {
+        // Unexistent agent.
+        if (is_metaconsole() === true
+            && $event['server_id'] > 0
+        ) {
+            $node->disconnect();
+        }
+
+        $eventsGrouped = [];
+    } finally {
+        if (is_metaconsole() === true
+            && $event['server_id'] > 0
+        ) {
+            $node->disconnect();
+        }
+    }
+
+    return $eventsGrouped;
+}
+
+
+/**
+ * Last comment for this event.
+ *
+ * @param array $event Info event.
+ *
+ * @return string Comment.
+ */
+function event_get_last_comment($event, $filter)
+{
+    $comments = event_get_comment($event, $filter);
+    if (empty($comments) === false) {
+        return $comments[0];
+    }
+
+    return '';
+}
+
+
+/**
+ * Get counter events same extraid.
+ *
+ * @param array $event   Event data.
+ * @param array $filters Filters.
+ *
+ * @return integer Counter.
+ */
+function event_get_counter_extraId(array $event, ?array $filters)
+{
+    $counters = 0;
+
+    $where = get_filter_date($filters);
+
+    $where[] = sprintf(
+        'AND `te`.`id_extra` = "%s"',
+        $event['id_extra']
+    );
+
+    try {
+        if (is_metaconsole() === true
+            && $event['server_id'] > 0
+        ) {
+            $node = new Node($event['server_id']);
+            $node->connect();
+        }
+
+        $sql = sprintf(
+            'SELECT count(*)
+            FROM tevento te
+            WHERE 1=1 %s',
+            implode(' ', $where)
+        );
+
+        // Get grouped comments.
+        $counters = db_get_value_sql($sql);
+    } catch (\Exception $e) {
+        // Unexistent agent.
+        if (is_metaconsole() === true
+            && $event['server_id'] > 0
+        ) {
+            $node->disconnect();
+        }
+
+        $counters = 0;
+    } finally {
+        if (is_metaconsole() === true
+            && $event['server_id'] > 0
+        ) {
+            $node->disconnect();
+        }
+    }
+
+    return $counters;
+}
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 68b90c5dc9..1b232ca1ca 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2162,7 +2162,8 @@ function html_print_extended_select_for_time(
     $custom_fields=false,
     $style_icon='',
     $no_change=false,
-    $allow_zero=0
+    $allow_zero=0,
+    $units=null
 ) {
     global $config;
     $admin = is_user_admin($config['id_user']);
@@ -2188,15 +2189,17 @@ function html_print_extended_select_for_time(
             $selected = 300;
     }
 
-    $units = [
-        1               => __('seconds'),
-        SECONDS_1MINUTE => __('minutes'),
-        SECONDS_1HOUR   => __('hours'),
-        SECONDS_1DAY    => __('days'),
-        SECONDS_1WEEK   => __('weeks'),
-        SECONDS_1MONTH  => __('months'),
-        SECONDS_1YEAR   => __('years'),
-    ];
+    if (empty($units) === true) {
+        $units = [
+            1               => __('seconds'),
+            SECONDS_1MINUTE => __('minutes'),
+            SECONDS_1HOUR   => __('hours'),
+            SECONDS_1DAY    => __('days'),
+            SECONDS_1WEEK   => __('weeks'),
+            SECONDS_1MONTH  => __('months'),
+            SECONDS_1YEAR   => __('years'),
+        ];
+    }
 
     if ($unique_name === true) {
         $uniq_name = uniqid($name);
@@ -3618,6 +3621,7 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
     $classes = '';
     $fixedId = '';
     $iconStyle = '';
+    $minimize_arrow = false;
     // $spanStyle = 'margin-top: 4px;';
     $spanStyle = '';
     if (empty($name) === true) {
@@ -3655,6 +3659,8 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
                 $buttonType = ($attr_array['type'] ?? 'button');
                 $buttonAttributes = $value;
                 break;
+            } else if ($attribute === 'minimize-arrow') {
+                $minimize_arrow = true;
             } else {
                 $attributes .= $attribute.'="'.$value.'" ';
             }
@@ -3679,15 +3685,30 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
         $iconDiv = '';
     }
 
+    if ($minimize_arrow === true) {
+        $minimezeDiv = html_print_div(
+            [
+                'id'    => 'minimize_arrow_event_sound',
+                'style' => 'background-color:transparent; right: 1em; margin-left:0.5em; position:relative; display:none;',
+                'class' => 'arrow_menu_down w30p',
+            ],
+            true
+        );
+    } else {
+        $minimezeDiv = '';
+    }
+
     // Defined id. Is usable for span and button.
     // TODO. Check if will be proper use button or submit when where appropiate.
     $mainId = ((empty($fixedId) === false) ? $fixedId : 'button-'.$name);
 
     if ($imageButton === false) {
-        $content = '<span id="span-'.$mainId.'" style="'.$spanStyle.'" class="font_11">'.$label.'</span>';
+        $content = $minimezeDiv;
+        $content .= '<span id="span-'.$mainId.'" style="'.$spanStyle.'" class="font_11">'.$label.'</span>';
         $content .= $iconDiv;
     } else {
-        $content = $iconDiv;
+        $content = $minimezeDiv;
+        $content .= $iconDiv;
     }
 
     // In case of not selected button type, in this case, will be normal button.
@@ -5504,7 +5525,10 @@ function html_print_input($data, $wrapper='div', $input_only=false)
                 ($data['attributes'] ?? null),
                 ((isset($data['return']) === true) ? $data['return'] : false),
                 ((isset($data['password']) === true) ? $data['password'] : false),
-                ((isset($data['function']) === true) ? $data['function'] : '')
+                ((isset($data['function']) === true) ? $data['function'] : ''),
+                ((isset($data['autocomplete']) === true) ? $data['autocomplete'] : 'off'),
+                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
+                ((isset($data['hide_div_eye']) === true) ? $data['hide_div_eye'] : false),
             );
         break;
 
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index ff18544586..143a538e20 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -353,7 +353,7 @@ function menu_print_menu(&$menu)
                 $secExtensionBool = false;
 
                 if ($secExtensionBool) {
-                    if (strlen($sub['icon']) > 0) {
+                    if (empty($sub['icon']) === false && strlen($sub['icon']) > 0) {
                         $icon_enterprise = false;
                         if (isset($sub['enterprise'])) {
                             $icon_enterprise = (bool) $sub['enterprise'];
@@ -380,7 +380,7 @@ function menu_print_menu(&$menu)
                     $secExtension = $sub['sec'];
                 }
 
-                if (strlen($secExtension) > 0) {
+                if (empty($secExtension) === false && strlen($secExtension) > 0) {
                     $secUrl = $secExtension;
                     $extensionInMenu = 'extension_in_menu='.$mainsec.'&amp;';
                 } else {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b2e3928b69..7b191d599a 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -88,8 +88,16 @@ function ui_bbcode_to_html($text, $allowed_tags=['[url]'])
  *
  * @return string Truncated text.
  */
-function ui_print_truncate_text($text, $numChars=GENERIC_SIZE_TEXT, $showTextInAToopTip=true, $return=true, $showTextInTitle=true, $suffix='&hellip;', $style=false)
-{
+function ui_print_truncate_text(
+    $text,
+    $numChars=GENERIC_SIZE_TEXT,
+    $showTextInAToopTip=true,
+    $return=true,
+    $showTextInTitle=true,
+    $suffix='&hellip;',
+    $style=false,
+    $forced_title=false
+) {
     global $config;
 
     if (is_string($numChars)) {
@@ -190,6 +198,10 @@ function ui_print_truncate_text($text, $numChars=GENERIC_SIZE_TEXT, $showTextInA
         }
     }
 
+    if ($forced_title === true) {
+        $truncateText = '<span class="forced_title" style="'.$style.'" data-title="'.$text.'" data-use_title_for_force_title="1>'.$truncateText.'</span>';
+    }
+
     if ($return == true) {
         return $truncateText;
     } else {
@@ -3742,28 +3754,71 @@ function ui_progress_extend(
  * Generate needed code to print a datatables jquery plugin.
  *
  * @param array $parameters All desired data using following format:
- * [
- *   'print' => true (by default printed)
- *   'id' => datatable id.
- *   'class' => datatable class.
- *   'style' => datatable style.
- *   'order' => [
- *      'field' => column name
- *      'direction' => asc or desc
- *    ],
- *   'default_pagination' => integer, default pagination is set to block_size
- *   'ajax_url' => 'include/ajax.php'  ajax_url.
- *   'ajax_data' => [ operation => 1 ] extra info to be sent.
- *   'ajax_postprocess' => a javscript function to postprocess data received
- *                         by ajax call. It is applied foreach row and must
- *                         use following format:
- * * [code]
- * * function (item) {
- * *       // Process received item, for instance, name:
- * *       tmp = '<span class=label>' + item.name + '</span>';
- * *       item.name = tmp;
- * *   }
- * * [/code]
+ *
+ * ```php
+ * $parameters = [
+ * // JS Parameters
+ * 'serverside' => true,
+ * 'paging' => true,
+ * 'default_pagination' => $config['block_size'],
+ * 'searching' => false,
+ * 'dom_elements' => "plfrtiB",
+ * 'pagination_options' => [default_pagination, 5, 10, 20, 100, 200, 500, 1000, "All"],
+ * 'ordering' => true,
+ * 'order' => [[0, "asc"]], //['field' => 'column_name', 'direction' => 'asc/desc']
+ * 'zeroRecords' => "No matching records found",
+ * 'emptyTable' => "No data available in table",
+ * 'no_sortable_columns' => [], //Allows the column name (db) from "columns" parameter
+ * 'csv_field_separator' => ",",
+ * 'csv_header' => true,
+ * 'mini_csv' => false,
+ * 'mini_pagination' => false,
+ * 'mini_search' => false,
+ * 'drawCallback' => undefined, //'console.log(123),'
+ * 'data_element' => undefined, //Rows processed
+ * 'ajax_postprocess' => undefined, //'process_datatables_item(item)'
+ * 'ajax_data' => undefined, //Extra data to be sent ['field1' => 1, 'field2 => 0]
+ * 'ajax_url' => undefined,
+ * 'caption' => undefined,
+ *
+ * // PHP Parameters
+ * 'id' => undefined, //Used for table and form id,
+ * 'columns' =>,
+ * 'column_names' =>,
+ * 'filter_main_class' =>,
+ * 'toggle_collapsed' =>true,
+ * 'search_button_class' => 'sub filter',
+ * 'csv' =>=1,
+ * 'form' =>
+ * ..[
+ * ....'id'            => $form_id,
+ * ....'class'         => 'flex-row',
+ * ....'style'         => 'width: 100%,',
+ * ....'js'            => '',
+ * ....'html'          => $filter,
+ * ....'inputs'        => [],
+ * ....'extra_buttons' => $buttons,
+ * ..],
+ * 'no_toggle'     => false,
+ * 'form_html' => undefined,
+ * 'toggle_collapsed' => true,
+ * 'class' => "", //Datatable class.
+ * 'style' => "" ,//Datatable style.
+ * 'return' => false,
+ * 'print' => true,
+ * ]
+ *
+ * ```
+ *
+ * ```php
+ * ajax_postprocess => a javscript function to postprocess data received
+ *                        by ajax call. It is applied foreach row and must
+ *                        use following format:
+ * function (item) {
+ *       // Process received item, for instance, name:
+ *       tmp = '<span class=label>' + item.name + '</span>';
+ *       item.name = tmp;
+ *   }
  *   'columns_names' => [
  *      'column1'  :: Used as th text. Direct text entry. It could be array:
  *      OR
@@ -3780,7 +3835,6 @@ function ui_progress_extend(
  *      'column2',
  *      ...
  *   ],
- *   'no_sortable_columns' => [ indexes ] 1,2... -1 etc. Avoid sorting.
  *   'form' => [
  *      'html' => 'html code' a directly defined inputs in HTML.
  *      'extra_buttons' => [
@@ -3812,12 +3866,7 @@ function ui_progress_extend(
  *      ]
  *   ],
  *   'extra_html' => HTML content to be placed after 'filter' section.
- *   'drawCallback' => function to be called after draw. Sample in:
- *            https://datatables.net/examples/advanced_init/row_grouping.html
- * ]
- *   'zeroRecords' => Message when zero records obtained from filter.(Leave blank for default).
- *   'emptyTable' => Message when table data empty.(Leave blank for default).
- * End.
+ * ```
  *
  * @return string HTML code with datatable.
  * @throws Exception On error.
@@ -3834,6 +3883,9 @@ function ui_print_datatable(array $parameters)
         $form_id = uniqid('datatable_filter_');
     }
 
+    $parameters['table_id'] = $table_id;
+    $parameters['form_id'] = $form_id;
+
     if (!isset($parameters['columns']) || !is_array($parameters['columns'])) {
         throw new Exception('[ui_print_datatable]: You must define columns for datatable');
     }
@@ -3853,10 +3905,6 @@ function ui_print_datatable(array $parameters)
         $parameters['default_pagination'] = $config['block_size'];
     }
 
-    if (!isset($parameters['paging'])) {
-        $parameters['paging'] = true;
-    }
-
     if (!isset($parameters['filter_main_class'])) {
         $parameters['filter_main_class'] = '';
     }
@@ -3865,13 +3913,9 @@ function ui_print_datatable(array $parameters)
         $parameters['toggle_collapsed'] = true;
     }
 
-    $no_sortable_columns = json_encode([]);
-    if (isset($parameters['no_sortable_columns'])) {
-        $no_sortable_columns = json_encode($parameters['no_sortable_columns']);
-    }
-
     if (!is_array($parameters['order'])) {
-        $order = '0, "asc"';
+        $order = 0;
+        $direction = 'asc';
     } else {
         if (!isset($parameters['order']['direction'])) {
             $direction = 'asc';
@@ -3890,47 +3934,35 @@ function ui_print_datatable(array $parameters)
             }
         }
 
-        $order .= ', "'.$parameters['order']['direction'].'"';
+        $direction = $parameters['order']['direction'];
     }
 
-    if (!isset($parameters['ajax_data'])) {
-        $parameters['ajax_data'] = '';
+    $parameters['order']['order'] = $order;
+    $parameters['order']['direction'] = $direction;
+
+    foreach ($parameters['no_sortable_columns'] as $key => $find) {
+        $found = array_search(
+            $parameters['no_sortable_columns'][$key],
+            $parameters['columns']
+        );
+
+        if ($found !== false) {
+            unset($parameters['no_sortable_columns'][$key]);
+            array_push($parameters['no_sortable_columns'], $found);
+        }
+
+        if (is_int($parameters['no_sortable_columns'][$key]) === false) {
+            unset($parameters['no_sortable_columns'][$key]);
+        }
     }
 
-    $search_button_class = 'sub filter';
+    $parameters['csvTextInfo'] = __('Export current page to CSV');
+    $parameters['csvFileTitle'] = sprintf(__('export_%s_current_page_%s'), $table_id, date('Y-m-d'));
+
     if (isset($parameters['search_button_class'])) {
         $search_button_class = $parameters['search_button_class'];
-    }
-
-    if (isset($parameters['pagination_options'])) {
-        $pagination_options = $parameters['pagination_options'];
     } else {
-        $pagination_options = [
-            [
-                // There is a limit of (2^32)^2 (18446744073709551615) rows in a MyISAM table, show for show all use max nrows.
-                // -1 Retun error or only 1 row.
-                $parameters['default_pagination'],
-                5,
-                10,
-                25,
-                100,
-                200,
-                500,
-                1000,
-                18446744073709551615,
-            ],
-            [
-                $parameters['default_pagination'],
-                5,
-                10,
-                25,
-                100,
-                200,
-                500,
-                1000,
-                'All',
-            ],
-        ];
+        $search_button_class = 'sub filter';
     }
 
     if (isset($parameters['datacolumns']) === false
@@ -3943,16 +3975,12 @@ function ui_print_datatable(array $parameters)
         $parameters['csv'] = 1;
     }
 
-    $dom_elements = '"plfrtiB"';
-    if (isset($parameters['dom_elements'])) {
-        $dom_elements = '"'.$parameters['dom_elements'].'"';
-    }
-
     $filter = '';
     // Datatable filter.
     if (isset($parameters['form']) && is_array($parameters['form'])) {
         if (isset($parameters['form']['id'])) {
             $form_id = $parameters['form']['id'];
+            $parameters['form_id'] = $form_id;
         }
 
         if (isset($parameters['form']['class'])) {
@@ -4070,10 +4098,13 @@ function ui_print_datatable(array $parameters)
         )
     );
     $processing .= '</div>';
+    $parameters['processing'] = $processing;
 
     $zeroRecords = isset($parameters['zeroRecords']) === true ? $parameters['zeroRecords'] : __('No matching records found');
     $emptyTable = isset($parameters['emptyTable']) === true ? $parameters['emptyTable'] : __('No data available in table');
 
+    $parameters['zeroRecords'] = $zeroRecords;
+    $parameters['emptyTable'] = $emptyTable;
     // Extra html.
     $extra = '';
     if (isset($parameters['extra_html']) && !empty($parameters['extra_html'])) {
@@ -4082,8 +4113,8 @@ function ui_print_datatable(array $parameters)
 
     // Base table.
     $table = '<table id="'.$table_id.'" ';
-    $table .= 'class="'.$parameters['class'].' invisible"';
-    $table .= 'style="'.$parameters['style'].'">';
+    $table .= 'class="'.$parameters['class'].'"';
+    $table .= 'style="box-sizing: border-box;'.$parameters['style'].'">';
     $table .= '<thead><tr class="datatables_thead_tr">';
 
     if (isset($parameters['column_names'])
@@ -4110,336 +4141,60 @@ function ui_print_datatable(array $parameters)
     }
 
     $table .= '</tr></thead>';
-
-    if (isset($parameters['data_element']) === true) {
-        $table .= '<tbody>';
-        foreach ($parameters['data_element'] as $row) {
-            $table .= '<tr>';
-            foreach ($row as $td_data) {
-                $table .= '<td>'.$td_data.'</td>';
-            }
-
-            $table .= '</tr>';
-        }
-
-        $table .= '</tbody>';
-
-        $js = '<script>
-            $.fn.dataTable.ext.classes.sPageButton = "pandora_pagination mini-pandora-pagination"
-            var table = $("#'.$table_id.'").DataTable({
-                "dom": "'.$parameters['dom_elements'].'"
-            });
-            $("div.spinner-fixed").hide();
-            $("table#'.$table_id.'").removeClass("invisible");
-            $("#'.$table_id.'_filter > label > input").addClass("mini-search-input");
-            if (table.page.info().pages == 1) {
-                $("#'.$table_id.'_paginate").hide();
-            }
-        </script>';
-    }
-
     $table .= '</table>';
 
-    $pagination_class = 'pandora_pagination';
-    if (!empty($parameters['pagination_class'])) {
-        $pagination_class = $parameters['pagination_class'];
+    $parameters['ajax_url_full'] = ui_get_full_url('ajax.php', false, false, false);
+
+    $parameters['spinnerLoading'] = html_print_image(
+        'images/spinner.gif',
+        true,
+        [
+            'id'    => $form_id.'_loading',
+            'class' => 'loading-search-datatables-button',
+        ]
+    );
+
+    $language = substr(get_user_language(), 0, 2);
+    if (is_metaconsole() === false) {
+        $parameters['language'] = 'include/javascript/i18n/dataTables.'.$language.'.json';
+    } else {
+        $parameters['language'] = '../../include/javascript/i18n/dataTables.'.$language.'.json';
     }
 
-    $columns = '';
-    for ($i = 1; $i <= (count($parameters['columns']) - 3); $i++) {
-        if ($i != (count($parameters['columns']) - 3)) {
-            $columns .= $i.',';
-        } else {
-            $columns .= $i;
-        }
+    $parameters['phpDate'] = date('Y-m-d');
+    $parameters['dataElements'] = json_encode($parameters['data_element']);
+
+    // * START JAVASCRIPT.
+    if (is_metaconsole() === false) {
+        $file_path = ui_get_full_url('include/javascript/datatablesFunction.js');
+    } else {
+        $file_path = ui_get_full_url('../../include/javascript/datatablesFunction.js');
     }
 
-    $export_columns = '';
-    if (isset($parameters['csv_exclude_latest']) === true
-        && $parameters['csv_exclude_latest'] === true
-    ) {
-        $export_columns = ',columns: \'th:not(:last-child)\'';
-    }
+    $file_content = file_get_contents($file_path);
+    $json_data = json_encode($parameters);
+    $json_config = json_encode($config);
 
-    if (isset($parameters['data_element']) === false || isset($parameters['print_pagination_search_csv'])) {
-        if (isset($parameters['ajax_url'])) {
-            $type_data = 'ajax: {
-                url: "'.ui_get_full_url('ajax.php', false, false, false).'",
-                type: "POST",
-                dataSrc: function (json) {
-                    if($("#'.$form_id.'_search_bt") != undefined) {
-                        $("#'.$form_id.'_loading").remove();
-                    }
+    $js = '<script>';
+    $js .= 'var dt = '.$json_data.';';
+    $js .= 'var config = '.$json_config.';';
+    $js .= '</script>';
 
-                    if (json.error) {
-                        console.error(json.error);
-                        $("#error-'.$table_id.'").html(json.error);
-                        $("#error-'.$table_id.'").dialog({
-                            title: "Filter failed",
-                            width: 630,
-                            resizable: true,
-                            draggable: true,
-                            modal: false,
-                            closeOnEscape: true,
-                            buttons: {
-                                "Ok" : function () {
-                                    $(this).dialog("close");
-                                }
-                            }
-                        }).parent().addClass("ui-state-error");
-                    } else {';
-
-            if (isset($parameters['ajax_return_operation']) === true
-                && empty($parameters['ajax_return_operation']) === false
-                && isset($parameters['ajax_return_operation_function']) === true
-                && empty($parameters['ajax_return_operation_function']) === false
-            ) {
-                $type_data .= '
-            if (json.'.$parameters['ajax_return_operation'].' !== undefined) {
-                '.$parameters['ajax_return_operation_function'].'(json.'.$parameters['ajax_return_operation'].');
-            }
-        ';
-            }
-
-            if (isset($parameters['ajax_postprocess'])) {
-                $type_data .= '
-                    if (json.data) {
-                        json.data.forEach(function(item) {
-                            '.$parameters['ajax_postprocess'].'
-                        });
-                    } else {
-                        json.data = {};
-                    }';
-            }
-
-            $type_data .= '
-                        return json.data;
-                    }
-                },
-                data: function (data) {
-                    if($("#button-'.$form_id.'_search_bt") != undefined) {
-                        var loading = \''.html_print_image(
-                        'images/spinner.gif',
-                        true,
-                        [
-                            'id'    => $form_id.'_loading',
-                            'class' => 'loading-search-datatables-button',
-                        ]
-                    ).'\';
-                        $("#button-'.$form_id.'_search_bt").parent().append(loading);
-                    }
-
-                    inputs = $("#'.$form_id.' :input");
-
-                    values = {};
-                    inputs.each(function() {
-                        values[this.name] = $(this).val();
-                    })
-
-                    $.extend(data, {
-                        filter: values,'."\n";
-
-            if (is_array($parameters['ajax_data'])) {
-                foreach ($parameters['ajax_data'] as $k => $v) {
-                    $type_data .= $k.':'.json_encode($v).",\n";
-                }
-            }
-
-            $type_data .= 'page: "'.$parameters['ajax_url'].'"
-                    });
-
-                    return data;
-                }
-            },';
-        } else {
-            $type_data = 'data: '.json_encode($parameters['data_element']).',';
-        }
-
-        $serverside = 'true';
-        if (isset($parameters['data_element'])) {
-            $serverside = 'false';
-        }
-
-        // Javascript controller.
-        $js = '<script type="text/javascript">
-        $(document).ready(function(){
-            $.fn.dataTable.ext.errMode = "none";
-            $.fn.dataTable.ext.classes.sPageButton = "'.$pagination_class.'";
-
-            var settings_datatable = {
-                drawCallback: function(settings) {';
-
-        if (!isset($parameters['data_element'])) {
-            $js .= 'if (dt_'.$table_id.'.page.info().pages > 1) {
-                        $("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").show()
-                    } else {
-                        $("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").hide()
-                    }';
-        }
-
-        $js .= 'if ($("#'.$table_id.' tr td").length == 1) {
-                    $(".datatable-msg-info-'.$table_id.'").show();
-                    $(".datatable-msg-info-'.$table_id.'").removeClass(\'invisible_important\');
-                    $("table#'.$table_id.'").hide();
-                    $("div.dataTables_paginate").hide();
-                    $("div.dataTables_info").hide();
-                    $("div.dataTables_length").hide();
-                    $("div.dt-buttons").hide();
-
-                    if (dt_'.$table_id.'.page.info().pages > 1) {
-                        $(".dataTables_paginate.paging_simple_numbers").show()
-                    }
-                } else {
-                    $(".datatable-msg-info-'.$table_id.'").hide();
-                    $("table#'.$table_id.'").show();
-                    $("div.dataTables_paginate").show();
-                    $("div.dataTables_info").hide();
-                    $("div.dataTables_length").show();
-                    $("div.dt-buttons").show();
-
-                    if (dt_'.$table_id.'.page.info().pages == 1) {
-                        $(".dataTables_paginate.paging_simple_numbers").hide()
-                    }
-                }';
-
-        if (isset($parameters['drawCallback'])) {
-            $js .= $parameters['drawCallback'];
-        }
-
-        $searching = 'false';
-        if (isset($parameters['searching']) && $parameters['searching'] === true) {
-            $searching = 'true';
-        }
-
-        $ordering = 'true';
-        if (isset($parameters['ordering']) && $parameters['ordering'] === false) {
-            $ordering = 'false';
-        }
-
-        $js .= '},';
-
-        $languaje = substr(get_user_language(), 0, 2);
-
-        $js .= '
-                processing: true,
-                serverSide: '.$serverside.',
-                paging: '.$parameters['paging'].',
-                pageLength: '.$parameters['default_pagination'].',
-                searching: '.$searching.',
-                responsive: true,
-                dom: '.$dom_elements.',
-                language: {
-                    url: "/pandora_console/include/javascript/i18n/dataTables.'.$languaje.'.json",
-                    processing:"'.$processing.'",
-                    zeroRecords:"'.$zeroRecords.'",
-                    emptyTable:"'.$emptyTable.'",
-                },
-                buttons: '.$parameters['csv'].'== 1 ? [
-                    {
-                        extend: "csv",
-                        text : "'.__('Export current page to CSV').'",
-                        titleAttr: "'.__('Export current page to CSV').'",
-                        title: "export_'.$parameters['id'].'_current_page_'.date('Y-m-d').'",
-                        fieldSeparator: "'.$config['csv_divider'].'",
-                        action: function ( e, dt, node, config ) {
-                            blockResubmit(node);
-                            // Call the default csvHtml5 action method to create the CSV file
-                            $.fn.dataTable.ext.buttons.csvHtml5.action.call(this, e, dt, node, config);
-                        },
-                        exportOptions : {
-                            modifier : {
-                                // DataTables core
-                                order : "current",
-                                page : "All",
-                                search : "applied"
-                            }'.$export_columns.'
-                        },
-                    }
-                ] : [],
-                lengthMenu: '.json_encode($pagination_options).',
-                columnDefs: [
-                    { className: "no-class", targets: "_all" },
-                    { bSortable: false, targets: '.$no_sortable_columns.' }
-                ],
-                ordering: '.$ordering.',
-                initComplete: function(settings, json) {
-                    // Move elements to table_action_buttons bar.
-                    $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
-                    $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
-                    $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
-                    $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
-
-                    let original_styles = $("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").attr("style");
-                    $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").attr("style", original_styles + " margin-right: 10px;"));
-                    $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_length"));
-                    $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dt-buttons"));
-                    $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
-                    $("div.spinner-fixed").hide();
-                },
-                columns: [';
-
-        foreach ($parameters['datacolumns'] as $data) {
-            if (is_array($data)) {
-                $js .= '{data : "'.$data['text'].'",className: "'.$data['class'].'"},';
-            } else {
-                $js .= '{data : "'.$data.'",className: "no-class"},';
-            }
-        }
-
-                $js .= '
-                ],
-                order: [[ '.$order.' ]],';
-                $js .= $type_data;
-                $js .= '
-            };
-
-            dt_'.$table_id.' = $("#'.$table_id.'").DataTable(settings_datatable);
-
-            $("#button-'.$form_id.'_search_bt").click(function (){
-                dt_'.$table_id.'.draw().page(0)
-            });
-            ';
-
-        if (isset($parameters['caption']) === true
-            && empty($parameters['caption']) === false
-        ) {
-            $js .= '$("#'.$table_id.'").append("<caption>'.$parameters['caption'].'</caption>");';
-            $js .= '$(".datatables_thead_tr").css("height", 0);';
-        }
-
-        if (isset($parameters['csv']) === true) {
-            $js."'$('#".$table_id."').on( 'buttons-processing', function ( e, indicator ) {
-                if ( indicator ) {
-                    console.log('a');
-                }
-                else {
-                    console.log('b');
-                }";
-        }
-
-        $js .= '$("table#'.$table_id.'").removeClass("invisible");
-            });';
-        $js .= '
-        $(function() {
-            $(document).on("preInit.dt", function (ev, settings) {
-                $("div.dataTables_length").hide();
-                $("div.dt-buttons").hide();
-            });
-        });
-
-        ';
-
-        $js .= '</script>';
-    }
-
-    // Order.
+    $js .= '<script>';
+    $js .= 'function '.$table_id.'(dt, config) {  ';
+    $js .= $file_content;
+    $js .= '}';
+    $js .= $table_id.'(dt, config)';
+    $js .= '</script>';
+    // * END JAVASCRIPT.
     $info_msg_arr = [];
     $info_msg_arr['message'] = $emptyTable;
     $info_msg_arr['div_class'] = 'info_box_container invisible_important datatable-msg-info-'.$table_id;
 
-    $spinner = '<div class="spinner-fixed"><span></span><span></span><span></span><span></span></div>';
+    $spinner = '<div id="'.$table_id.'-spinner" class="spinner-fixed"><span></span><span></span><span></span><span></span></div>';
 
     $info_msg = '<div>'.ui_print_info_message($info_msg_arr).'</div>';
+
     $err_msg = '<div id="error-'.$table_id.'"></div>';
     $output = $info_msg.$err_msg.$filter.$extra.$spinner.$table.$js;
     if (is_ajax() === false) {
@@ -4463,7 +4218,7 @@ function ui_print_datatable(array $parameters)
             false,
             false
         );
-        $output .= '?v='.$config['current_package'].'"/>';
+        $output .= '"/>';
         // Load tables.css.
         $output .= '<link rel="stylesheet" href="';
         $output .= ui_get_full_url(
@@ -5045,7 +4800,10 @@ function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
                 $url .= $key.'['.$k.']='.$v.'&';
             }
         } else {
-            $url .= $key.'='.io_safe_input(rawurlencode($value)).'&';
+            $aux = (empty($value) === false)
+                ? io_safe_input(rawurlencode($value))
+                : '';
+            $url .= $key.'='.$aux.'&';
         }
     }
 
@@ -7329,68 +7087,55 @@ function ui_print_breadcrums($tab_name)
  *
  * @return string  HTML string with the last comment of the events.
  */
-function ui_print_comments($comments)
+function ui_print_comments($comments, $truncate_limit=255)
 {
     global $config;
 
-    $comments = explode('<br>', $comments);
-    $comments = str_replace(["\n", '&#x0a;'], '<br>', $comments);
-    if (is_array($comments)) {
-        foreach ($comments as $comm) {
-            if (empty($comm)) {
-                continue;
-            }
-
-            $comments_array[] = io_safe_output(json_decode($comm, true));
-        }
-    }
-
-    $order_utimestamp = array_reduce(
-        $comments_array,
-        function ($carry, $item) {
-            foreach ($item as $k => $v) {
-                $carry[$v['utimestamp']] = $v;
-            }
-
-            return $carry;
-        }
-    );
-
-    $key_max_utimestamp = max(array_keys($order_utimestamp));
-
-    $last_comment = $order_utimestamp[$key_max_utimestamp];
-
-    if (empty($last_comment) === true) {
+    if (empty($comment) === true) {
         return '';
     }
 
     // Only show the last comment. If commment its too long,the comment will short with ...
     // If $config['prominent_time'] is timestamp the date show Month, day, hour and minutes.
     // Else show comments hours ago
-    if ($last_comment['action'] != 'Added comment') {
-        $last_comment['comment'] = $last_comment['action'];
+    if ($comment['action'] != 'Added comment') {
+        $comment['comment'] = $comment['action'];
     }
 
-    $short_comment = substr($last_comment['comment'], 0, 20);
+    $short_comment = substr($comment['comment'], 0, 20);
     if ($config['prominent_time'] == 'timestamp') {
-        $comentario = '<i>'.date($config['date_format'], $last_comment['utimestamp']).'&nbsp;('.$last_comment['id_user'].'):&nbsp;'.$last_comment['comment'].'';
+        $comentario = '<i>'.date($config['date_format'], $comment['utimestamp']).'&nbsp;('.$comment['id_user'].'):&nbsp;'.$comment['comment'].'';
 
-        if (strlen($comentario) > '200px') {
-            $comentario = '<i>'.date($config['date_format'], $last_comment['utimestamp']).'&nbsp;('.$last_comment['id_user'].'):&nbsp;'.$short_comment.'...';
+        if (strlen($comentario) > '200px' && $truncate_limit >= 255) {
+            $comentario = '<i>'.date($config['date_format'], $comment['utimestamp']).'&nbsp;('.$comment['id_user'].'):&nbsp;'.$short_comment.'...';
         }
     } else {
-        $rest_time = (time() - $last_comment['utimestamp']);
+        $rest_time = (time() - $comment['utimestamp']);
         $time_last = (($rest_time / 60) / 60);
 
-        $comentario = '<i>'.number_format($time_last, 0, $config['decimal_separator'], ($config['thousand_separator'] ?? ',')).'&nbsp; Hours &nbsp;('.$last_comment['id_user'].'):&nbsp;'.$last_comment['comment'].'';
+        $comentario = '<i>'.number_format($time_last, 0, $config['decimal_separator'], ($config['thousand_separator'] ?? ',')).'&nbsp; Hours &nbsp;('.$comment['id_user'].'):&nbsp;'.$comment['comment'].'';
 
-        if (strlen($comentario) > '200px') {
-            $comentario = '<i>'.number_format($time_last, 0, $config['decimal_separator'], ($config['thousand_separator'] ?? ',')).'&nbsp; Hours &nbsp;('.$last_comment['id_user'].'):&nbsp;'.$short_comment.'...';
+        if (strlen($comentario) > '200px' && $truncate_limit >= 255) {
+            $comentario = '<i>'.number_format($time_last, 0, $config['decimal_separator'], ($config['thousand_separator'] ?? ',')).'&nbsp; Hours &nbsp;('.$comment['id_user'].'):&nbsp;'.$short_comment.'...';
         }
     }
 
-    return io_safe_output($comentario);
+    $comentario = io_safe_output($comentario);
 
+    if (strlen($comentario) >= $truncate_limit) {
+        $comentario = ui_print_truncate_text(
+            $comentario,
+            $truncate_limit,
+            false,
+            true,
+            false,
+            '&hellip;',
+            true,
+            true,
+        );
+    }
+
+    return $comentario;
 }
 
 
@@ -8232,6 +7977,133 @@ function ui_print_fav_menu($id_element, $url, $label, $section)
 }
 
 
+function ui_print_tree(
+    $tree,
+    $id=0,
+    $depth=0,
+    $last=0,
+    $last_array=[],
+    $sufix=false,
+    $descriptive_ids=false,
+    $previous_id=''
+) {
+    static $url = false;
+    $output = '';
+
+    // Get the base URL for images.
+    if ($url === false) {
+        $url = ui_get_full_url('operation/tree', false, false, false);
+    }
+
+    // Leaf.
+    if (empty($tree['__LEAVES__'])) {
+        return '';
+    }
+
+    $count = 0;
+    $total = (count(array_keys($tree['__LEAVES__'])) - 1);
+    $last_array[$depth] = $last;
+    $class = 'item_'.$depth;
+
+    if ($depth > 0) {
+        $output .= '<ul id="ul_'.$id.'" class="mrgn_0px pdd_0px invisible">';
+    } else {
+        $output .= '<ul id="ul_'.$id.'" class="mrgn_0px pdd_0px">';
+    }
+
+    foreach ($tree['__LEAVES__'] as $level => $sub_level) {
+        // Id used to expand leafs.
+        $sub_id = time().rand(0, getrandmax());
+        // Display the branch.
+        $output .= '<li id="li_'.$sub_id.'" class="'.$class.' mrgn_0px pdd_0px">';
+
+        // Indent sub branches.
+        for ($i = 1; $i <= $depth; $i++) {
+            if ($last_array[$i] == 1) {
+                $output .= '<img src="'.$url.'/no_branch.png" class="vertical_middle">';
+            } else {
+                $output .= '<img src="'.$url.'/branch.png" class="vertical_middle">';
+            }
+        }
+
+        // Branch.
+        if (! empty($sub_level['sublevel']['__LEAVES__'])) {
+            $output .= "<a id='anchor_$sub_id' onfocus='javascript: this.blur();' href='javascript: toggleTreeNode(\"$sub_id\", \"$id\");'>";
+            if ($depth == 0 && $count == 0) {
+                if ($count == $total) {
+                    $output .= '<img src="'.$url.'/one_closed.png" class="vertical_middle">';
+                } else {
+                    $output .= '<img src="'.$url.'/first_closed.png" class="vertical_middle">';
+                }
+            } else if ($count == $total) {
+                $output .= '<img src="'.$url.'/last_closed.png" class="vertical_middle">';
+            } else {
+                $output .= '<img src="'.$url.'/closed.png" class="vertical_middle">';
+            }
+
+            $output .= '</a>';
+        }
+
+        // Leave.
+        else {
+            if ($depth == 0 && $count == 0) {
+                if ($count == $total) {
+                    $output .= '<img src="'.$url.'/no_branch.png" class="vertical_middle">';
+                } else {
+                    $output .= '<img src="'.$url.'/first_leaf.png" class="vertical_middle">';
+                }
+            } else if ($count == $total) {
+                $output .= '<img src="'.$url.'/last_leaf.png" class="vertical_middle">';
+            } else {
+                $output .= '<img src="'.$url.'/leaf.png" class="vertical_middle">';
+            }
+        }
+
+        $checkbox_name_sufix = ($sufix === true) ? '_'.$level : '';
+        if ($descriptive_ids === true) {
+            $checkbox_name = 'create_'.$sub_id.$previous_id.$checkbox_name_sufix;
+        } else {
+            $checkbox_name = 'create_'.$sub_id.$checkbox_name_sufix;
+        }
+
+        $previous_id = $checkbox_name_sufix;
+        if ($sub_level['selectable'] === true) {
+            $output .= html_print_checkbox(
+                $sub_level['name'],
+                $sub_level['value'],
+                $sub_level['checked'],
+                true,
+                false,
+                '',
+                true
+            );
+        }
+
+        $output .= '&nbsp;<span>'.$sub_level['label'].'</span>';
+
+        $output .= '</li>';
+
+        // Recursively print sub levels.
+        $output .= ui_print_tree(
+            $sub_level['sublevel'],
+            $sub_id,
+            ($depth + 1),
+            (($count == $total) ? 1 : 0),
+            $last_array,
+            $sufix,
+            $descriptive_ids,
+            $previous_id
+        );
+
+        $count++;
+    }
+
+    $output .= '</ul>';
+
+    return $output;
+}
+
+
 function ui_update_name_fav_element($id_element, $section, $label)
 {
     $label = io_safe_output($label);
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index f99484df1f..0170da7f07 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -1274,52 +1274,50 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
             );
             $form_items_advance['element_group_row']['html'] .= '</td>';
 
-    if (!$config['legacy_vc']) {
-        $intervals = [
-            10   => '10 '.__('seconds'),
-            30   => '30 '.__('seconds'),
-            60   => '1 '.__('minutes'),
-            300  => '5 '.__('minutes'),
-            900  => '15 '.__('minutes'),
-            1800 => '30 '.__('minutes'),
-            3600 => '1 '.__('hour'),
-        ];
+    $intervals = [
+        10   => '10 '.__('seconds'),
+        30   => '30 '.__('seconds'),
+        60   => '1 '.__('minutes'),
+        300  => '5 '.__('minutes'),
+        900  => '15 '.__('minutes'),
+        1800 => '30 '.__('minutes'),
+        3600 => '1 '.__('hour'),
+    ];
 
-        $form_items_advance['cache_expiration_row'] = [];
-        $form_items_advance['cache_expiration_row']['items'] = [
-            'static_graph',
-            'percentile_bar',
-            'percentile_item',
-            'module_graph',
-            'simple_value',
-            'datos',
-            'auto_sla_graph',
-            'group_item',
-            'bars_graph',
-            'donut_graph',
-            'color_cloud',
-            'service',
-        ];
-        $form_items_advance['cache_expiration_row']['html'] = '<td align="left">';
-        $form_items_advance['cache_expiration_row']['html'] .= __('Cache expiration');
-        $form_items_advance['cache_expiration_row']['html'] .= '</td>';
-        $form_items_advance['cache_expiration_row']['html'] .= '<td align="left">';
-        $form_items_advance['cache_expiration_row']['html'] .= html_print_extended_select_for_time(
-            'cache_expiration',
-            $config['vc_default_cache_expiration'],
-            '',
-            __('No cache'),
-            0,
-            false,
-            true,
-            false,
-            true,
-            '',
-            false,
-            $intervals
-        );
-        $form_items_advance['cache_expiration_row']['html'] .= '</td>';
-    }
+    $form_items_advance['cache_expiration_row'] = [];
+    $form_items_advance['cache_expiration_row']['items'] = [
+        'static_graph',
+        'percentile_bar',
+        'percentile_item',
+        'module_graph',
+        'simple_value',
+        'datos',
+        'auto_sla_graph',
+        'group_item',
+        'bars_graph',
+        'donut_graph',
+        'color_cloud',
+        'service',
+    ];
+    $form_items_advance['cache_expiration_row']['html'] = '<td align="left">';
+    $form_items_advance['cache_expiration_row']['html'] .= __('Cache expiration');
+    $form_items_advance['cache_expiration_row']['html'] .= '</td>';
+    $form_items_advance['cache_expiration_row']['html'] .= '<td align="left">';
+    $form_items_advance['cache_expiration_row']['html'] .= html_print_extended_select_for_time(
+        'cache_expiration',
+        $config['vc_default_cache_expiration'],
+        '',
+        __('No cache'),
+        0,
+        false,
+        true,
+        false,
+        true,
+        '',
+        false,
+        $intervals
+    );
+    $form_items_advance['cache_expiration_row']['html'] .= '</td>';
 
     // Insert and modify before the buttons to create or update.
     if (enterprise_installed()) {
@@ -1454,12 +1452,9 @@ function visual_map_editor_print_toolbox()
         visual_map_print_button_editor('box_item', __('Box'), 'left', false, 'box_item', true);
         visual_map_print_button_editor('line_item', __('Line'), 'left', false, 'line_item', true);
         visual_map_print_button_editor('color_cloud', __('Color cloud'), 'left', false, 'color_cloud_min', true);
-    if (isset($config['legacy_vc']) === false
-        || (bool) $config['legacy_vc'] === false
-    ) {
-        // Applies only on modern VC.
-        visual_map_print_button_editor('network_link', __('Network link'), 'left', false, 'network_link_min', true);
-    }
+
+    // Applies only on modern VC.
+    visual_map_print_button_editor('network_link', __('Network link'), 'left', false, 'network_link_min', true);
 
     if (defined('METACONSOLE')) {
         echo '<a href="javascript:" class="tip"><img src="'.$config['homeurl_static'].'/images/tip.png" data-title="The data displayed in editor mode is not real" data-use_title_for_force_title="1" 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index bce475ad4f..6b64cae989 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -259,7 +259,7 @@ function flot_area_graph(
 
     $return .= html_print_input_hidden(
         'line_width_graph',
-        $config['custom_graph_width'],
+        (empty($params['line_width']) === true) ? $config['custom_graph_width'] : $params['line_width'],
         true
     );
     $return .= "<div id='timestamp_$graph_id'
diff --git a/pandora_console/include/javascript/datatablesFunction.js b/pandora_console/include/javascript/datatablesFunction.js
new file mode 100644
index 0000000000..41f0bbf1e2
--- /dev/null
+++ b/pandora_console/include/javascript/datatablesFunction.js
@@ -0,0 +1,378 @@
+var dt = dt;
+var config = config;
+
+var datacolumns = [];
+var datacolumnsTemp = [];
+dt.datacolumns.forEach(column => {
+  if (column === null) return;
+  if (typeof column !== "string") {
+    datacolumnsTemp = { data: column.text, className: column.class };
+    datacolumns.push(datacolumnsTemp);
+  } else {
+    datacolumnsTemp = { data: column, className: "no-class" };
+    datacolumns.push(datacolumnsTemp);
+  }
+});
+
+var paginationClass = "pandora_pagination";
+if (typeof dt.pagination_class !== "undefined") {
+  paginationClass = dt.pagination_class;
+}
+
+var processing = "";
+if (typeof dt.processing === "undefined") {
+  processing = dt.processing;
+}
+
+var ajaxReturn = "";
+var ajaxReturnFunction = "";
+if (
+  typeof dt.ajax_return_operation !== "undefined" &&
+  dt.ajax_return_operation !== "" &&
+  typeof dt.ajax_return_operation_function !== "undefined" &&
+  dt.ajax_return_operation_function !== ""
+) {
+  ajaxReturn = dt.ajax_return_operation;
+  ajaxReturnFunction = dt.ajax_return_operation_function;
+}
+
+var serverSide = true;
+if (typeof dt.data_element !== "undefined") {
+  serverSide = false;
+}
+
+var paging = true;
+if (typeof dt.paging !== "undefined") {
+  paging = dt.paging;
+}
+
+var pageLength = parseInt(dt.default_pagination);
+
+var searching = false;
+if (typeof dt.searching !== "undefined" && dt.searching === true) {
+  searching = dt.searching;
+}
+
+var dom = "plfrtiB";
+if (typeof dt.dom_elements !== "undefined") {
+  dom = dt.dom_elements;
+}
+
+var lengthMenu = [
+  [pageLength, 5, 10, 20, 100, 200, 500, 1000, -1],
+  [pageLength, 5, 10, 20, 100, 200, 500, 1000, "All"]
+];
+if (typeof dt.pagination_options !== "undefined") {
+  lengthMenu = dt.pagination_options;
+}
+
+var ordering = true;
+if (typeof dt.ordering !== "undefined" && dt.ordering === false) {
+  ordering = dt.ordering;
+}
+
+var order = [[0, "asc"]];
+if (typeof dt.order !== "undefined") {
+  order = [[dt.order.order, dt.order.direction]];
+}
+
+var zeroRecords = "";
+if (typeof dt.zeroRecords !== "undefined") {
+  zeroRecords = `${dt.zeroRecords}`;
+}
+
+var emptyTable = "";
+if (typeof dt.emptyTable !== "undefined") {
+  emptyTable = `${dt.emptyTable}`;
+}
+
+var no_sortable_columns = [];
+if (typeof dt.no_sortable_columns !== "undefined") {
+  no_sortable_columns = Object.values(dt.no_sortable_columns);
+}
+
+var columnDefs = [];
+if (typeof dt.columnDefs === "undefined") {
+  columnDefs = [
+    { className: "no-class", targets: "_all" },
+    { bSortable: false, targets: no_sortable_columns }
+  ];
+} else {
+  columnDefs = dt.columnDefs;
+}
+
+var csvClassName = "csv-button";
+if (dt.mini_csv === true) {
+  csvClassName = "mini-csv-button";
+}
+
+var csvFieldSeparator = ";";
+if (typeof dt.csv_field_separator !== "undefined") {
+  csvFieldSeparator = dt.csv_field_separator;
+}
+
+var csvHeader = true;
+if (dt.csv_header === false) {
+  csvHeader = false;
+}
+
+var csvExcludeLast = "";
+if (dt.csv_exclude_latest === true) {
+  csvExcludeLast = "th:not(:last-child)";
+}
+
+var ajaxData = "";
+if (typeof dt.ajax_data !== "undefined") {
+  ajaxData = dt.ajax_data;
+}
+
+$(document).ready(function() {
+  function checkPages() {
+    if (dt_table.page.info().pages > 1) {
+      $(
+        "div.pagination-child-div > .dataTables_paginate.paging_simple_numbers"
+      ).show();
+      $(`#${dt.id}_paginate`).show();
+    } else {
+      $(
+        "div.pagination-child-div > .dataTables_paginate.paging_simple_numbers"
+      ).hide();
+      $(`#${dt.id}_paginate`).hide();
+    }
+  }
+
+  function moveElementsToActionButtons() {
+    $(".action_buttons_right_content").html(
+      '<div class="pagination-child-div"></div>'
+    );
+    $(".pagination-child-div").append(
+      $(`#${dt.id}_wrapper > .dataTables_paginate.paging_simple_numbers`).attr(
+        "style",
+        "margin-right: 10px;"
+      )
+    );
+    $(".pagination-child-div").append(
+      $(`#${dt.id}_wrapper > .dataTables_length`)
+    );
+    $(".pagination-child-div").append($(`#${dt.id}_wrapper > .dt-buttons`));
+    $(".pagination-child-div").append(
+      $(`#${dt.id}_wrapper > .dataTables_filter`)
+    );
+  }
+
+  $.fn.dataTable.ext.errMode = "none";
+  $.fn.dataTable.ext.classes.sPageButton = paginationClass;
+
+  if (dt.mini_pagination === true) {
+    $.fn.dataTable.ext.classes.sPageButton = `${paginationClass} mini-pandora-pagination`;
+  }
+
+  var settings_datatable = {
+    processing: true,
+    responsive: true,
+    serverSide,
+    paging,
+    pageLength,
+    searching,
+    dom,
+    lengthMenu,
+    ordering,
+    order,
+    columns: eval(datacolumns),
+    columnDefs,
+    language: {
+      url: dt.language,
+      processing,
+      zeroRecords,
+      emptyTable
+    },
+    buttons:
+      dt.csv == 1
+        ? [
+            {
+              extend: "csv",
+              className: csvClassName,
+              text: dt.csvTextInfo,
+              titleAttr: dt.csvTextInfo,
+              title: dt.csvFileTitle,
+              fieldSeparator: csvFieldSeparator,
+              header: csvHeader,
+              action: function(e, dt, node, config) {
+                blockResubmit(node);
+                // Call the default csvHtml5 action method to create the CSV file
+                $.fn.dataTable.ext.buttons.csvHtml5.action.call(
+                  this,
+                  e,
+                  dt,
+                  node,
+                  config
+                );
+              },
+              exportOptions: {
+                modifier: {
+                  // DataTables core
+                  order: "current",
+                  page: "All",
+                  search: "applied"
+                },
+                columns: csvExcludeLast
+              }
+            }
+          ]
+        : [],
+    initComplete: function(settings, json) {
+      moveElementsToActionButtons();
+
+      checkPages();
+
+      $(`div#${dt.id}-spinner`).hide();
+    },
+    drawCallback: function(settings) {
+      if ($(`#${dt.id} tr td`).length == 1) {
+        $(`.datatable-msg-info-${dt.id}`)
+          .removeClass("invisible_important")
+          .show();
+        $(`table#${dt.id}`).hide();
+        $("div.pagination-child-div").hide();
+        $("div.dataTables_info").hide();
+        $(`#${dt.id}_wrapper`).hide();
+        $(`.action_buttons_right_content .pagination-child-div`).hide();
+      } else {
+        $(`.datatable-msg-info-${dt.id}`).hide();
+        $(`table#${dt.id}`).show();
+        $("div.pagination-child-div").show();
+        $("div.dataTables_info").show();
+        $(`#${dt.id}_wrapper`).show();
+
+        if (typeof dt.drawCallback !== "undefined") {
+          eval(dt.drawCallback);
+        }
+      }
+
+      $(`div#${dt.id}-spinner`).hide();
+
+      checkPages();
+    }
+  };
+
+  var ajaxOrData = {};
+  if (typeof dt.data_element == "undefined") {
+    ajaxOrData = {
+      ajax: {
+        url: dt.ajax_url_full,
+        type: "POST",
+        dataSrc: function(json) {
+          if ($(`#${dt.form_id}_search_bt`) != undefined) {
+            $(`#${dt.form_id}_loading`).remove();
+          }
+
+          if (json.error) {
+            console.error(json.error);
+            $(`#error-${dt.id}`).html(json.error);
+            $(`#error-${dt.id}`)
+              .dialog({
+                title: "Filter failed",
+                width: 630,
+                resizable: true,
+                draggable: true,
+                modal: false,
+                closeOnEscape: true,
+                buttons: {
+                  Ok: function() {
+                    $(this).dialog("close");
+                  }
+                }
+              })
+              .parent()
+              .addClass("ui-state-error");
+          } else {
+            if (json.ajaxReturn !== "undefined") {
+              eval(`${ajaxReturnFunction}(${json.ajaxReturn})`);
+            }
+
+            if (typeof dt.ajax_postprocess !== "undefined") {
+              if (json.data) {
+                json.data.forEach(function(item) {
+                  eval(dt.ajax_postprocess);
+                });
+              } else {
+                json.data = {};
+              }
+            }
+
+            return json.data;
+          }
+        },
+        data: function(data) {
+          $(`div#${dt.id}-spinner`).show();
+          if ($(`#button-${dt.form_id}_search_bt`) != undefined) {
+            var loading = `<img src="images/spinner.gif" id="${dt.form_id}_loading" class="loading-search-datatables-button" />`;
+            $(`#button-${dt.form_id}_search_bt`)
+              .parent()
+              .append(loading);
+          }
+
+          var inputs = $(`#${dt.form_id} :input`);
+
+          var values = {};
+          inputs.each(function() {
+            values[this.name] = $(this).val();
+          });
+
+          $.extend(data, ajaxData);
+
+          $.extend(data, {
+            filter: values,
+            page: dt.ajax_url
+          });
+
+          return data;
+        }
+      }
+    };
+  } else {
+    ajaxOrData = { data: dt.data_element };
+  }
+
+  $.extend(settings_datatable, ajaxOrData);
+  var dt_table = $(`#${dt.table_id}`).DataTable(settings_datatable);
+
+  $(`#button-${dt.form_id}_search_bt`).click(function() {
+    dt_table.draw().page(0);
+  });
+
+  if (typeof dt.caption !== "undefined" && dt.caption !== "") {
+    $(`#${dt.table_id}`).append(`<caption>${dt.caption}</caption>`);
+    $(".datatables_thead_tr").css("height", 0);
+  }
+
+  $(function() {
+    $(document).on("init.dt", function(ev, settings) {
+      if (dt.mini_search === true) {
+        $(`#${dt.id}_filter > label > input`).addClass("mini-search-input");
+      }
+
+      $("div.dataTables_length").show();
+      $("div.dataTables_filter").show();
+      $("div.dt-buttons").show();
+
+      if (dt_table.page.info().pages === 0) {
+        $(`.action_buttons_right_content .pagination-child-div`).hide();
+      }
+
+      if (dt_table.page.info().pages === 1) {
+        $(`div.pagination-child-div > #${dt.table_id}_paginate`).hide();
+      } else {
+        $(`div.pagination-child-div > #${dt.table_id}_paginate`).show();
+      }
+    });
+  });
+});
+
+$(function() {
+  $(document).on("preInit.dt", function(ev, settings) {
+    $(`#${dt.id}_wrapper  div.dataTables_length`).hide();
+    $(`#${dt.id}_wrapper  div.dataTables_filter`).hide();
+    $(`#${dt.id}_wrapper  div.dt-buttons`).hide();
+  });
+});
diff --git a/pandora_console/include/javascript/extensions_discovery.js b/pandora_console/include/javascript/extensions_discovery.js
new file mode 100644
index 0000000000..a2cb6c85d0
--- /dev/null
+++ b/pandora_console/include/javascript/extensions_discovery.js
@@ -0,0 +1,25 @@
+/* global $, interval */
+$(document).ready(() => {
+  if (interval === "0") {
+    setTimeout(() => {
+      $("#mode_interval")
+        .parent()
+        .find("[id^='interval']")
+        .hide();
+    }, 100);
+  }
+});
+
+function changeModeInterval(e) {
+  if ($(e).val() === "manual") {
+    $(e)
+      .parent()
+      .find("[id^='interval']")
+      .hide();
+  } else {
+    var interval = $(e)
+      .parent()
+      .find("div[id^='interval']")[0];
+    $(interval).show();
+  }
+}
diff --git a/pandora_console/include/javascript/i18n/dataTables.en.json b/pandora_console/include/javascript/i18n/dataTables.en.json
index 9ccd76c4ad..d80bbe6e75 100644
--- a/pandora_console/include/javascript/i18n/dataTables.en.json
+++ b/pandora_console/include/javascript/i18n/dataTables.en.json
@@ -6,7 +6,6 @@
     "infoThousands": ",",
     "lengthMenu": "Show _MENU_ entries",
     "loadingRecords": "Loading...",
-    "processing": "Processing...",
     "search": "Search:",
     "zeroRecords": "No matching records found",
     "thousands": ",",
diff --git a/pandora_console/include/javascript/manage_extensions.js b/pandora_console/include/javascript/manage_extensions.js
new file mode 100644
index 0000000000..e5c98c6a58
--- /dev/null
+++ b/pandora_console/include/javascript/manage_extensions.js
@@ -0,0 +1,72 @@
+/* globals $, page, url, textsToTranslate, confirmDialog*/
+$(document).ready(function() {
+  function loading(status) {
+    if (status) {
+      $(".spinner-fixed").show();
+      $("#button-upload_button").attr("disabled", "true");
+    } else {
+      $(".spinner-fixed").hide();
+      $("#button-upload_button").removeAttr("disabled");
+    }
+  }
+
+  $("#uploadExtension").submit(function(e) {
+    e.preventDefault();
+    var formData = new FormData(this);
+    formData.append("page", page);
+    formData.append("method", "validateIniName");
+    loading(true);
+    $.ajax({
+      method: "POST",
+      url: url,
+      data: formData,
+      processData: false,
+      contentType: false,
+      success: function(data) {
+        loading(false);
+        data = JSON.parse(data);
+        if (data.success) {
+          if (data.warning) {
+            confirmDialog({
+              title: textsToTranslate["Warning"],
+              message: data.message,
+              strOKButton: textsToTranslate["Confirm"],
+              strCancelButton: textsToTranslate["Cancel"],
+              onAccept: function() {
+                loading(true);
+                $("#uploadExtension")[0].submit();
+              },
+              onDeny: function() {
+                return false;
+              }
+            });
+          } else {
+            $("#uploadExtension")[0].submit();
+          }
+        } else {
+          confirmDialog({
+            title: textsToTranslate["Error"],
+            message: data.message,
+            ok: textsToTranslate["Ok"],
+            hideCancelButton: true,
+            onAccept: function() {
+              return false;
+            }
+          });
+        }
+      },
+      error: function() {
+        loading(false);
+        confirmDialog({
+          title: textsToTranslate["Error"],
+          message: textsToTranslate["Failed to upload extension"],
+          ok: textsToTranslate["Ok"],
+          hideCancelButton: true,
+          onAccept: function() {
+            return false;
+          }
+        });
+      }
+    });
+  });
+});
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 7916b921d6..6c31136c34 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -55,7 +55,7 @@ function show_event_dialog(event, dialog_page) {
           title: event.evento,
           resizable: true,
           draggable: true,
-          modal: true,
+          modal: false,
           minWidth: 875,
           minHeight: 600,
           close: function() {
@@ -484,7 +484,7 @@ function event_comment(current_event) {
     success: function() {
       $("#button-comment_button").removeAttr("disabled");
       $("#response_loading").hide();
-      $("#link_comments").click();
+      $("#button-filter_comments_button").click();
     }
   });
 
@@ -943,6 +943,185 @@ function process_buffers(buffers) {
   }
 }
 
+function openSoundEventsDialogModal(settings, dialog_parameters, reload) {
+  let mode = $("#hidden-mode_alert").val();
+  if (reload != false) {
+    if (mode == 0) {
+      let filter_id = $("#filter_id option:selected").val();
+      let interval = $("#interval option:selected").val();
+      let time_sound = $("#time_sound option:selected").val();
+      let sound_id = $("#sound_id option:selected").val();
+      let parameters = {
+        filter_id: filter_id,
+        interval: interval,
+        time_sound: time_sound,
+        sound_id: sound_id,
+        mode: mode
+      };
+      parameters = JSON.stringify(parameters);
+      parameters = btoa(parameters);
+      let url =
+        window.location + "&settings=" + settings + "&parameters=" + parameters;
+      $(location).attr("href", url);
+    } else {
+      let url = window.location + "&settings=" + settings;
+      $(location).attr("href", url);
+    }
+  } else {
+    openSoundEventsDialog(settings, dialog_parameters, reload);
+  }
+}
+
+function openSoundEventsDialog(settings, dialog_parameters, reload) {
+  let encode_settings = settings;
+  if (reload == undefined) {
+    reload = true;
+  }
+  if (dialog_parameters != undefined) {
+    dialog_parameters = JSON.parse(atob(dialog_parameters));
+  }
+  settings = JSON.parse(atob(settings));
+  // Check modal exists and is open.
+  if (
+    $("#modal-sound").hasClass("ui-dialog-content") &&
+    $("#modal-sound").dialog("isOpen")
+  ) {
+    $(".ui-dialog-titlebar-minimize").trigger("click");
+    return;
+  }
+  //Modify button
+  $("#minimize_arrow_event_sound").removeClass("arrow_menu_up");
+  $("#minimize_arrow_event_sound").addClass("arrow_menu_down");
+  $("#minimize_arrow_event_sound").show();
+
+  // Initialize modal.
+  $("#modal-sound")
+    .empty()
+    .dialog({
+      title: settings.title,
+      resizable: false,
+      modal: false,
+      width: 600,
+      height: 600,
+      open: function() {
+        $.ajax({
+          method: "post",
+          url: settings.url,
+          data: {
+            page: settings.page,
+            drawConsoleSound: 1
+          },
+          dataType: "html",
+          success: function(data) {
+            $("#modal-sound").append(data);
+            $("#tabs-sound-modal").tabs({
+              disabled: [1]
+            });
+
+            // Test sound.
+            $("#button-melody_sound").click(function() {
+              var sound = false;
+              if ($("#id_sound_event").length == 0) {
+                sound = true;
+              }
+
+              test_sound_button(sound, settings.urlSound);
+            });
+
+            // Play Stop.
+            $("#button-start-search").click(function() {
+              if (reload == true) {
+                openSoundEventsDialogModal(encode_settings, 0, reload);
+              }
+              var mode = $("#hidden-mode_alert").val();
+              var action = false;
+              if (mode == 0) {
+                action = true;
+              }
+              if ($("#button-start-search").hasClass("play")) {
+                $("#modal-sound").css({
+                  height: "500px"
+                });
+                $("#modal-sound")
+                  .parent()
+                  .css({
+                    height: "550px"
+                  });
+              } else {
+                $("#modal-sound").css({
+                  height: "450px"
+                });
+                $("#modal-sound")
+                  .parent()
+                  .css({
+                    height: "500px"
+                  });
+              }
+
+              action_events_sound(action, settings);
+            });
+
+            if (reload == false && dialog_parameters != undefined) {
+              if ($("#button-start-search").hasClass("play")) {
+                $("#filter_id").val(dialog_parameters["filter_id"]);
+                $("#interval").val(dialog_parameters["interval"]);
+                $("#time_sound").val(dialog_parameters["time_sound"]);
+                $("#sound_id").val(dialog_parameters["sound_id"]);
+
+                $("#filter_id").trigger("change");
+                $("#interval").trigger("change");
+                $("#time_sound").trigger("change");
+                $("#sound_id").trigger("change");
+
+                $("#button-start-search").trigger("click");
+              }
+            }
+
+            // Silence Alert.
+            $("#button-no-alerts").click(function() {
+              if ($("#button-no-alerts").hasClass("silence-alerts") === true) {
+                // Remove audio.
+                remove_audio();
+
+                // Clean events.
+                $("#tabs-sound-modal .elements-discovered-alerts ul").empty();
+                $("#tabs-sound-modal .empty-discovered-alerts").removeClass(
+                  "invisible_important"
+                );
+
+                // Clean progress.
+                $("#progressbar_time").empty();
+
+                // Change img button.
+                $("#button-no-alerts")
+                  .removeClass("silence-alerts")
+                  .addClass("alerts");
+                // Change value button.
+                $("#button-no-alerts").val(settings.noAlert);
+                $("#button-no-alerts > span").text(settings.noAlert);
+
+                // Background button.
+                $(".container-button-alert").removeClass("fired");
+
+                // New progress.
+                listen_event_sound(settings);
+              }
+            });
+          },
+          error: function(error) {
+            console.error(error);
+          }
+        });
+      },
+      close: function() {
+        $("#minimize_arrow_event_sound").hide();
+        remove_audio();
+        $(this).dialog("destroy");
+      }
+    })
+    .show();
+}
+
 function openSoundEventModal(settings) {
   if ($("#hidden-metaconsole_activated").val() === "1") {
     var win = open(
@@ -966,6 +1145,7 @@ function openSoundEventModal(settings) {
   }
 
   settings = JSON.parse(atob(settings));
+
   // Check modal exists and is open.
   if (
     $("#modal-sound").hasClass("ui-dialog-content") &&
@@ -1045,10 +1225,12 @@ function add_audio(urlSound) {
       sound +
       "' autoplay='true' hidden='true' loop='false'>"
   );
+  $("#button-sound_events_button").addClass("animation-blink");
 }
 
 function remove_audio() {
   $(".actions-sound-modal audio").remove();
+  $("#button-sound_events_button").removeClass("animation-blink");
 }
 
 function listen_event_sound(settings) {
@@ -1064,6 +1246,37 @@ function listen_event_sound(settings) {
 }
 
 function check_event_sound(settings) {
+  // Update elements time.
+  $(".elements-discovered-alerts ul li").each(function() {
+    let element_time = $(this)
+      .children(".li-hidden")
+      .val();
+    let obj_time = new Date(element_time);
+    let current_dt = new Date();
+    let timestamp = current_dt.getTime() - obj_time.getTime();
+    timestamp = timestamp / 1000;
+    if (timestamp <= 60) {
+      timestamp = Math.round(timestamp) + " seconds";
+    } else if (timestamp <= 3600) {
+      let minute = Math.floor((timestamp / 60) % 60);
+      minute = minute < 10 ? "0" + minute : minute;
+      let second = Math.floor(timestamp % 60);
+      second = second < 10 ? "0" + second : second;
+      timestamp = minute + " minutes " + second + " seconds";
+    } else {
+      let hour = Math.floor(timestamp / 3600);
+      hour = hour < 10 ? "0" + hour : hour;
+      let minute = Math.floor((timestamp / 60) % 60);
+      minute = minute < 10 ? "0" + minute : minute;
+      let second = Math.round(timestamp % 60);
+      second = second < 10 ? "0" + second : second;
+      timestamp = hour + " hours " + minute + " minutes " + second + " seconds";
+    }
+    $(this)
+      .children(".li-time")
+      .children("span")
+      .html(timestamp);
+  });
   jQuery.post(
     settings.url,
     {
@@ -1117,7 +1330,13 @@ function check_event_sound(settings) {
             "beforeend",
             '<div class="li-time">' + element.timestamp + "</div>"
           );
-          $("#tabs-sound-modal .elements-discovered-alerts ul").append(li);
+          li.insertAdjacentHTML(
+            "beforeend",
+            '<input type="hidden" value="' +
+              element.event_timestamp +
+              '" class="li-hidden"/>'
+          );
+          $("#tabs-sound-modal .elements-discovered-alerts ul").prepend(li);
         });
 
         // -100 delay sound.
@@ -1229,3 +1448,285 @@ function removeElement(name_select, id_modal) {
       .append(option);
   });
 }
+
+function get_table_events_tabs(event, filter) {
+  var custom_event_view_hr = $("#hidden-comments_events_max_hours_old").val();
+  $.post({
+    url: "ajax.php",
+    data: {
+      page: "include/ajax/events",
+      get_comments: 1,
+      event: event,
+      filter: filter,
+      custom_event_view_hr: custom_event_view_hr
+    },
+    dataType: "html",
+    success: function(data) {
+      $("#extended_event_comments_page").empty();
+      $("#extended_event_comments_page").html(data);
+    }
+  });
+}
+// Define the minimize button functionality;
+function hidden_dialog(dialog) {
+  setTimeout(function() {
+    $("#modal-sound").css("visibility", "hidden");
+    dialog.css("z-index", "-1");
+  }, 200);
+}
+
+function show_dialog(dialog) {
+  setTimeout(function() {
+    $("#modal-sound").css("visibility", "visible");
+    dialog.css("z-index", "1115");
+  }, 50);
+}
+
+/*
+#############################################################################
+##
+## + Compacts the Modal Sound Dialog to a tiny toolbar
+## + Dynamically adds a button which can reduce/reapply the dialog size
+## + If alarm gets raised & minimized, the dialog window maximizes and the toolbar flashes red for 10 seconds. 
+## - Works fine until a link/action gets clicked. The Toolbar shifts to the bottom of the Modal-Sound Dialog.
+##
+#############################################################################
+*/
+
+$(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
+  const requestBody = ajaxOptions.data;
+  try {
+    if (requestBody && requestBody.includes("drawConsoleSound=1")) {
+      console.log(
+        "AJAX request sent with drawConsoleSound=1:",
+        ajaxOptions.url
+      );
+
+      // Find the dialog element by the aria-describedby attribute
+      var dialog = $('[aria-describedby="modal-sound"]');
+
+      // Select the close button within the dialog
+      var closeButton = dialog.find(".ui-dialog-titlebar-close");
+
+      // Add the minimize button before the close button
+      var minimizeButton = $("<button>", {
+        class:
+          "ui-corner-all ui-widget ui-button-icon-only ui-window-minimize ui-dialog-titlebar-minimize",
+        type: "button",
+        title: "Minimize",
+        style: "float: right;margin-right: 1.5em;"
+      }).insertBefore(closeButton);
+
+      // Add the minimize icon to the minimize button
+      $("<span>", {
+        class: "ui-button-icon ui-icon ui-icon-minusthick",
+        style: "background-color: #fff;"
+      }).appendTo(minimizeButton);
+
+      $("<span>", {
+        class: "ui-button-icon-space"
+      })
+        .html(" ")
+        .appendTo(minimizeButton);
+
+      // Add the disengage button before the minimize button
+      var disengageButton = $("<button>", {
+        class:
+          "ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-disengage",
+        type: "button",
+        title: "Disengage",
+        style: "float: right;margin-right: 0.5em; position:relative;"
+      }).insertBefore(minimizeButton);
+
+      // Add the disengage icon to the disengage button
+      $("<span>", {
+        class: "ui-button-icon ui-icon ui-icon-circle-triangle-n",
+        style: "background-color: #fff;"
+      }).appendTo(disengageButton);
+
+      $("<span>", {
+        class: "ui-button-icon-space"
+      })
+        .html(" ")
+        .appendTo(disengageButton);
+
+      minimizeButton.click(function(e) {
+        console.log("here");
+        if ($("#minimize_arrow_event_sound").hasClass("arrow_menu_up")) {
+          console.log("arrow_menu_up");
+          $("#minimize_arrow_event_sound").removeClass("arrow_menu_up");
+          $("#minimize_arrow_event_sound").addClass("arrow_menu_down");
+        } else if (
+          $("#minimize_arrow_event_sound").hasClass("arrow_menu_down")
+        ) {
+          console.log("arrow_menu_down");
+          $("#minimize_arrow_event_sound").removeClass("arrow_menu_down");
+          $("#minimize_arrow_event_sound").addClass("arrow_menu_up");
+        }
+
+        if (!dialog.data("isMinimized")) {
+          $(".ui-widget-overlay").hide();
+          console.log("Minimize Window");
+          dialog.data("originalPos", dialog.position());
+          dialog.data("originalSize", {
+            width: dialog.width(),
+            height: dialog.height()
+          });
+          dialog.data("isMinimized", true);
+
+          dialog.animate(
+            {
+              height: "40px",
+              top: 0,
+              top: $(window).height() - 100
+            },
+            200,
+            "linear",
+            hidden_dialog(dialog)
+          );
+          dialog.css({ height: "" });
+          dialog.animate(
+            {
+              height: dialog.data("originalSize").height + "px",
+              top: dialog.data("originalPos").top + "px"
+            },
+            5
+          );
+          //dialog.find(".ui-dialog-content").hide();
+        } else {
+          console.log("Restore Window");
+          $(".ui-widget-overlay").show();
+          //dialog.find(".ui-dialog-content").show();
+          dialog.data("isMinimized", false);
+
+          dialog.animate(
+            {
+              height: "40px",
+              top: 0,
+              top: $(window).height() - 100
+            },
+            5
+          );
+          dialog.animate(
+            {
+              height: dialog.data("originalSize").height + "px",
+              top: dialog.data("originalPos").top + "px"
+            },
+            200,
+            "linear",
+            show_dialog(dialog)
+          );
+        }
+      });
+
+      disengageButton.click(function() {
+        $(".ui-dialog-titlebar-close").trigger("click");
+        $("#button-sound_events_button_hidden").trigger("click");
+      });
+
+      // Listener to check if the dialog content contains <li> elements
+      var dialogContent = dialog.find(".ui-dialog-content");
+      var observer = new MutationObserver(function(mutations) {
+        mutations.forEach(function(mutation) {
+          var addedNodes = mutation.addedNodes;
+          for (var i = 0; i < addedNodes.length; i++) {
+            if (addedNodes[i].nodeName.toLowerCase() === "li") {
+              console.log("The dialog content contains an <li> tag.");
+              break;
+            }
+          }
+        });
+      });
+
+      // Configure and start observing the dialog content for changes
+      var config = { childList: true, subtree: true };
+      observer.observe(dialogContent[0], config);
+    }
+  } catch (e) {
+    console.log(e);
+  }
+});
+
+/*
+#############################################################################
+##
+## + Compacts the Modal Sound Dialog popup and removes the widget-overlay 
+##
+##
+#############################################################################
+*/
+$(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
+  const requestBody = ajaxOptions.data;
+  try {
+    if (requestBody && requestBody.includes("drawConsoleSound=1")) {
+      console.log(
+        "AJAX request sent with drawConsoleSound=1:",
+        ajaxOptions.url
+      );
+
+      // Find the dialog element by the aria-describedby attribute
+      var dialog = $('[aria-describedby="modal-sound"]');
+      dialog.css({
+        // "backgroundColor":"black",
+        // "color":"white"
+      });
+
+      // Set CSS properties for #modal-sound
+      $("#modal-sound").css({
+        height: "450px",
+        margin: "0px"
+      });
+
+      // Set CSS properties for #tabs-sound-modal
+      $("#tabs-sound-modal").css({
+        "margin-top": "0px",
+        padding: "0px",
+        "font-weight": "bolder"
+      });
+
+      // Set CSS properties for #actions-sound-modal
+      $("#actions-sound-modal").css({
+        "margin-bottom": "0px"
+      });
+
+      // Hide the overlay with specific class and z-index
+      $('.ui-widget-overlay.ui-front[style="z-index: 10000;"]').css(
+        "display",
+        "none"
+      );
+
+      // Handle the 'change' event for #modal-sound, simply to compact the size of the img "No alerts discovered"
+      // An image should always have a size assigned!!!
+      $("#modal-sound").on("change", function() {
+        // Find the image within the specific div
+        var image = $(this).find(
+          'img.invert_filter.forced_title[data-title="No alerts discovered"][alt="No alerts discovered"]'
+        );
+
+        // Set the desired width and height
+        var width = 48;
+        var height = 48;
+
+        // Resize the image
+        image.width(width);
+        image.height(height);
+      });
+    }
+  } catch (e) {
+    console.log(e);
+  }
+});
+
+function loadModal() {
+  const urlSearch = window.location.search;
+  const urlParams = new URLSearchParams(urlSearch);
+  if (urlParams.has("settings")) {
+    let modal_parameters = "";
+    if (urlParams.has("parameters")) {
+      modal_parameters = urlParams.get("parameters");
+    }
+    let settings = urlParams.get("settings");
+    openSoundEventsDialogModal(settings, modal_parameters, false);
+  }
+}
+window.onload = loadModal;
diff --git a/pandora_console/include/javascript/timezone/src/date.js b/pandora_console/include/javascript/timezone/src/date.js
index 63b3a4e94a..0016caadf1 100644
--- a/pandora_console/include/javascript/timezone/src/date.js
+++ b/pandora_console/include/javascript/timezone/src/date.js
@@ -893,6 +893,17 @@
       var utcMillis = typeof dt === "number" ? dt : new Date(dt).getTime();
       var t = tz;
       var zoneList = _this.zones[t];
+
+      if (typeof zoneList === "undefined") {
+        zoneList = [
+          [-53.46666666666666, "-", "LMT", -2422051200000],
+          [-60, "C-Eur", "CE%sT", -776556000000],
+          [-60, "SovietZone", "CE%sT", -725932800000],
+          [-60, "Germany", "CE%sT", 347068800000],
+          [-60, "EU", "CE%sT", null]
+        ];
+      }
+
       // Follow links to get to an actual zone
       while (typeof zoneList === "string") {
         t = zoneList;
diff --git a/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php b/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php
index ff5d22a539..85665e7e4c 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php
@@ -297,6 +297,14 @@ class BasicChart extends Widget
             $values['label'] = $decoder['label'];
         }
 
+        if (isset($decoder['type_graph']) === true) {
+            $values['type_graph'] = $decoder['type_graph'];
+        }
+
+        if (isset($decoder['line_width']) === true) {
+            $values['line_width'] = $decoder['line_width'];
+        }
+
         return $values;
     }
 
@@ -477,6 +485,22 @@ class BasicChart extends Widget
             ],
         ];
 
+        $types_graph = [
+            'area' => __('Area'),
+            'line' => __('Wire'),
+        ];
+
+        $inputs['inputs']['row1'][] = [
+            'label'     => __('Type graph'),
+            'arguments' => [
+                'type'     => 'select',
+                'fields'   => $types_graph,
+                'name'     => 'type_graph',
+                'selected' => $values['type_graph'],
+                'return'   => true,
+            ],
+        ];
+
         $inputs['inputs']['row2'][] = [
             'label'     => __('Show Value'),
             'arguments' => [
@@ -520,6 +544,18 @@ class BasicChart extends Widget
             ],
         ];
 
+        $inputs['inputs']['row2'][] = [
+            'label'     => __('Graph line size'),
+            'arguments' => [
+                'name'   => 'line_width',
+                'type'   => 'number',
+                'value'  => (empty($values['line_width']) === true) ? 3 : $values['line_width'],
+                'return' => true,
+                'min'    => 2,
+                'max'    => 10,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -546,6 +582,8 @@ class BasicChart extends Widget
         $values['colorChart'] = \get_parameter('colorChart');
         $values['formatData'] = \get_parameter_switch('formatData');
         $values['label'] = \get_parameter('label');
+        $values['type_graph'] = \get_parameter('type_graph');
+        $values['line_width'] = \get_parameter('line_width');
 
         return $values;
     }
@@ -606,6 +644,8 @@ class BasicChart extends Widget
             'title'              => $module_name,
             'unit'               => $units_name,
             'only_image'         => false,
+            'type_graph'         => $this->values['type_graph'],
+            'line_width'         => (empty($this->values['line_width']) === true) ? 3 : $this->values['line_width'],
             'menu'               => false,
             'vconsole'           => true,
             'return_img_base_64' => false,
diff --git a/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php b/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php
index b00c3ae421..10ddd2bc9c 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php
@@ -520,7 +520,7 @@ class DataMatrix extends Widget
                     [
                         'id'                  => $tableId,
                         'class'               => 'info_table',
-                        'style'               => 'width: 99%',
+                        'style'               => 'width: 100%',
                         'columns'             => $columns,
                         'column_names'        => $column_names,
                         'ajax_url'            => 'include/ajax/module',
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index 86a50eefef..351d78ffec 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -438,7 +438,7 @@ class ModulesByStatus extends Widget
                     [
                         'id'                 => $tableId,
                         'class'              => 'info_table align-left-important',
-                        'style'              => 'width: 99%',
+                        'style'              => 'width: 100%',
                         'columns'            => $columns,
                         'column_names'       => $column_names,
                         'ajax_url'           => 'include/ajax/module',
diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
index adc9b3234e..ad9725825d 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
@@ -528,7 +528,7 @@ class EventsListWidget extends Widget
 
         $values['eventType'] = \get_parameter('eventType', 0);
         $values['maxHours'] = \get_parameter('maxHours', 8);
-        $values['limit'] = \get_parameter('limit', 20);
+        $values['limit'] = (int) \get_parameter('limit', 20);
         $values['eventStatus'] = \get_parameter('eventStatus', -1);
         $values['severity'] = \get_parameter_switch('severity', -1);
         $values['groupId'] = \get_parameter_switch('groupId', []);
@@ -708,6 +708,10 @@ class EventsListWidget extends Widget
         $hash = get_parameter('auth_hash', '');
         $id_user = get_parameter('id_user', '');
 
+        if ($this->values['limit'] === 'null') {
+            $this->values['limit'] = $config['block_size'];
+        }
+
         // Print datatable.
         $output .= ui_print_datatable(
             [
diff --git a/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php b/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
index 7d00c43715..b026ffcd9e 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
@@ -395,7 +395,9 @@ class SystemGroupStatusWidget extends Widget
         $user_groups = users_get_groups(false, 'AR', $return_all_group);
 
         $selected_groups = explode(',', $this->values['groupId'][0]);
+        $all_group_selected = false;
         if (in_array(0, $selected_groups) === true) {
+            $all_group_selected = true;
             $selected_groups = [];
             foreach (groups_get_all() as $key => $name_group) {
                 $selected_groups[] = groups_get_id($name_group);
@@ -480,7 +482,12 @@ class SystemGroupStatusWidget extends Widget
             }
         }
 
-        $this->values['groupId'] = $selected_groups;
+        if ($all_group_selected === true && $this->values['groupRecursion'] === true) {
+            $this->values['groupId'] = array_keys($result_groups);
+        } else {
+            $this->values['groupId'] = $selected_groups;
+        }
+
         $this->values['status'] = explode(',', $this->values['status'][0]);
 
         $style = 'font-size: 1.5em; font-weight: bolder;text-align: center;';
diff --git a/pandora_console/include/streams.php b/pandora_console/include/streams.php
index 9097750bf7..72f62ecce8 100644
--- a/pandora_console/include/streams.php
+++ b/pandora_console/include/streams.php
@@ -59,6 +59,7 @@ class StreamReader {
 class StringReader {
   var $_pos;
   var $_str;
+  var $is_overloaded;
 
   function __construct($str='') {
     $this->_str = $str;
diff --git a/pandora_console/include/styles/diagnostics.css b/pandora_console/include/styles/diagnostics.css
index 706038cbd0..579a8777eb 100644
--- a/pandora_console/include/styles/diagnostics.css
+++ b/pandora_console/include/styles/diagnostics.css
@@ -8,7 +8,7 @@
   text-align: center;
   font-size: 1.5em;
   font-weight: bolder;
-  color: #000;
+  color: var(--text-color);
   background: var(--secondary-color);
   padding: 8px;
 }
@@ -47,16 +47,36 @@
   font-size: 1.2em;
 }
 
+.title-self-monitoring {
+  border-top: 1px solid var(--border-color);
+  border-right: 1px solid var(--border-color);
+  border-left: 1px solid var(--border-color);
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
 .container-self-monitoring {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
+  background-color: var(--secondary-color);
+  border-right: 1px solid var(--border-color);
+  border-bottom: 1px solid var(--border-color);
+  border-left: 1px solid var(--border-color);
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+  padding-bottom: 15px;
 }
 
 .element-self-monitoring {
   flex: 2 1 600px;
 }
 
+.element-self-monitoring > img[data-title="No data"] {
+  margin-top: 5%;
+  margin-left: 20%;
+}
+
 .footer-self-monitoring {
   margin: 30px;
   font-style: italic;
diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css
index 4bb7b200c6..2e6967f19a 100644
--- a/pandora_console/include/styles/discovery.css
+++ b/pandora_console/include/styles/discovery.css
@@ -4,14 +4,13 @@
 
 ul.bigbuttonlist {
   min-height: 200px;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 li.discovery {
-  display: inline-block;
-  float: left;
   width: 250px;
   margin: 15px;
-  padding-bottom: 50px;
 }
 
 li.discovery > a {
@@ -37,8 +36,7 @@ div.data_container {
   width: 100%;
   height: 100%;
   text-align: center;
-  padding-top: 30px;
-  padding-bottom: 30px;
+  padding: 6px;
 }
 
 div.data_container:hover {
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 4f7b639eaa..c750550595 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -558,3 +558,10 @@ div#sunburst > svg {
   width: 750px;
   height: 750px;
 }
+
+div.container-filter-buttons {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
diff --git a/pandora_console/include/styles/form.css b/pandora_console/include/styles/form.css
index fd7e496aac..a0e5957358 100644
--- a/pandora_console/include/styles/form.css
+++ b/pandora_console/include/styles/form.css
@@ -365,3 +365,7 @@ form#modal_form_feedback > ul > li > textarea {
 form#modal_form_feedback > ul > li:not(:first-child) > label {
   margin-top: 20px !important;
 }
+
+table.dataTable {
+  box-sizing: border-box !important;
+}
diff --git a/pandora_console/include/styles/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css
index d9adde2a0f..c6fc0ae8f7 100644
--- a/pandora_console/include/styles/js/jquery-ui_custom.css
+++ b/pandora_console/include/styles/js/jquery-ui_custom.css
@@ -45,16 +45,41 @@
   font-size: 11pt;
   top: 2px;
 }
-.ui-dialog .ui-dialog-titlebar-close {
+
+.ui-dialog .ui-dialog-titlebar-minimize {
   position: absolute;
-  right: 1em;
+  right: 1.5em;
   width: 21px;
   margin: 0px 0 0 0;
   padding: 1px;
   height: 20px;
   bottom: 30%;
-  top: 20%;
+  top: 2em;
+  background-color: #fff !important;
 }
+
+.ui-dialog .ui-dialog-titlebar-minimize:hover {
+  cursor: pointer;
+}
+
+.ui-dialog .ui-dialog-titlebar-disengage {
+  position: relative;
+  right: 1.5em;
+  width: 21px;
+  margin: 0px 0 0 0;
+  padding: 1px;
+  height: 20px;
+  bottom: 30%;
+  background-color: #fff !important;
+  -ms-transform: scale(1.2);
+  -webkit-transform: scale(1.2);
+  transform: scale(1.2);
+}
+
+.ui-dialog .ui-dialog-titlebar-disengage:hover {
+  cursor: pointer;
+}
+
 .ui-dialog .ui-dialog-content {
   position: relative;
   border: 0;
diff --git a/pandora_console/include/styles/login.css b/pandora_console/include/styles/login.css
index 4314296d15..30d29c584c 100644
--- a/pandora_console/include/styles/login.css
+++ b/pandora_console/include/styles/login.css
@@ -351,6 +351,7 @@ span.span1 {
   font-family: "lato-bolder";
   color: #fff;
   margin-right: 30px;
+  text-shadow: 2px 2px #000;
 }
 
 span.span2 {
@@ -361,6 +362,7 @@ span.span2 {
   font-family: "lato-bolder";
   color: #fff;
   margin-right: 30px;
+  text-shadow: 2px 2px #000;
 }
 
 div.img_banner_login img {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e0ca7fc68f..117f62c65d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -31,6 +31,8 @@
   --primary-color: #14524f;
   --secondary-color: #ffffff;
   --input-border: #c0ccdc;
+  --border-color: #eee;
+  --text-color: #333;
 }
 
 /*
@@ -2304,7 +2306,7 @@ div#main_pure {
   position: static;
 }
 
-.ui-draggable {
+.ui-draggable-handle {
   cursor: move;
 }
 
@@ -4210,13 +4212,6 @@ div.simple_value > a > span.text p {
 }
 
 .modalokbutton {
-  transition-property: background-color, color;
-  transition-duration: 1s;
-  transition-timing-function: ease-out;
-  -webkit-transition-property: background-color, color;
-  -webkit-transition-duration: 1s;
-  -o-transition-property: background-color, color;
-  -o-transition-duration: 1s;
   cursor: pointer;
   text-align: center;
   margin-right: 45px;
@@ -4227,44 +4222,24 @@ div.simple_value > a > span.text p {
   border-radius: 3px;
   width: 90px;
   height: 30px;
-  background-color: white;
-  border: 1px solid #82b92e;
+  background-color: var(--primary-color);
+  border: 1px solid var(--primary-color);
+  border-radius: 6px;
 }
 
 .modalokbuttontext {
-  transition-property: background-color, color;
-  transition-duration: 1s;
-  transition-timing-function: ease-out;
-  -webkit-transition-property: background-color, color;
-  -webkit-transition-duration: 1s;
-  -o-transition-property: background-color, color;
-  -o-transition-duration: 1s;
-  color: #82b92e;
+  color: #fff;
   font-size: 10pt;
   position: relative;
   top: 6px;
 }
 
 .modalokbutton:hover {
-  transition-property: background-color, color;
-  transition-duration: 1s;
-  transition-timing-function: ease-out;
-  -webkit-transition-property: background-color, color;
-  -webkit-transition-duration: 1s;
-  -o-transition-property: background-color, color;
-  -o-transition-duration: 1s;
-  background-color: #82b92e;
+  background-color: var(--primary-color);
 }
 
 .modalokbutton:hover .modalokbuttontext {
-  transition-property: background-color, color;
-  transition-duration: 1s;
-  transition-timing-function: ease-out;
-  -webkit-transition-property: background-color, color;
-  -webkit-transition-duration: 1s;
-  -o-transition-property: background-color, color;
-  -o-transition-duration: 1s;
-  color: white;
+  color: #fff;
 }
 
 .modaldeletebutton {
@@ -7623,6 +7598,10 @@ div.graph div.legend table {
   padding-bottom: 10px !important;
 }
 
+.pdd_b_15px_important {
+  padding-bottom: 15px !important;
+}
+
 .pdd_b_20px {
   padding-bottom: 20px;
 }
@@ -7701,6 +7680,10 @@ div.graph div.legend table {
   padding-top: 15px;
 }
 
+.pdd_t_15px_important {
+  padding-top: 15px !important;
+}
+
 .pdd_t_20px {
   padding-top: 20px;
 }
@@ -9037,8 +9020,7 @@ div.graph div.legend table {
 }
 
 .app_mssg {
-  position: absolute;
-  bottom: 1em;
+  margin: 1em;
   clear: both;
   color: #888;
 }
@@ -11666,14 +11648,14 @@ p.trademark-copyright {
 }
 
 .show-hide-pass {
-  position: relative;
-  right: 40px;
+  position: absolute;
+  right: 9px;
   top: 4px;
   border: 0;
   outline: none;
   margin: 0;
   height: 30px;
-  width: 30px;
+  width: 40px;
   cursor: pointer;
   display: inline-block;
 }
@@ -11949,7 +11931,7 @@ span.help_icon_15px > img {
 /* ==== Spinner ==== */
 .spinner-fixed {
   position: absolute;
-  left: 40%;
+  left: 45%;
   top: 40%;
   z-index: 1;
   width: 100px;
@@ -11959,6 +11941,7 @@ span.help_icon_15px > img {
   animation: animate 1.2s linear infinite;
   margin: auto;
   margin-bottom: 40px;
+  text-align: initial;
 }
 .spinner-fixed span {
   position: absolute;
@@ -12341,3 +12324,117 @@ tr[id^="network_component-plugin-wmi-fields-dynamicMacroRow-"] input,
 tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
   width: 100% !important;
 }
+
+.animation-blink {
+  -webkit-animation: glowing 1500ms infinite;
+  -moz-animation: glowing 1500ms infinite;
+  -o-animation: glowing 1500ms infinite;
+  animation: glowing 1500ms infinite;
+  background: #14524f !important;
+  border-color: #14524f !important;
+}
+
+@-webkit-keyframes glowing {
+  0% {
+    background: #14524f !important;
+    -webkit-box-shadow: 0 0 3px #14524f;
+  }
+  50% {
+    background: #1d7873 !important;
+    -webkit-box-shadow: 0 0 40px #1d7873;
+  }
+  100% {
+    background: #14524f !important;
+    -webkit-box-shadow: 0 0 3px #14524f;
+  }
+}
+
+@-moz-keyframes glowing {
+  0% {
+    background: #14524f !important;
+    -moz-box-shadow: 0 0 3px #14524f;
+  }
+  50% {
+    background: #1d7873 !important;
+    -moz-box-shadow: 0 0 40px #1d7873;
+  }
+  100% {
+    background: #14524f !important;
+    -moz-box-shadow: 0 0 3px #14524f;
+  }
+}
+
+@-o-keyframes glowing {
+  0% {
+    background: #14524f !important;
+    box-shadow: 0 0 3px #14524f;
+  }
+  50% {
+    background: #1d7873 !important;
+    box-shadow: 0 0 40px #1d7873;
+  }
+  100% {
+    background: #14524f !important;
+    box-shadow: 0 0 3px #14524f;
+  }
+}
+
+@keyframes glowing {
+  0% {
+    background: #14524f !important;
+    box-shadow: 0 0 3px #14524f;
+  }
+  50% {
+    background: #1d7873 !important;
+    box-shadow: 0 0 40px #1d7873;
+  }
+  100% {
+    background: #14524f !important;
+    box-shadow: 0 0 3px #14524f;
+  }
+}
+
+.actions-sound-modal .buttons-sound-modal button.play,
+.actions-sound-modal .buttons-sound-modal input[type="button"].play {
+  background: url(../../images/play-white.png), transparent !important;
+  background-repeat: no-repeat !important;
+  background-position: 82px 14px !important;
+  color: #ffffff;
+  padding-left: 20px;
+  border: 0;
+}
+
+.actions-sound-modal .buttons-sound-modal div.play {
+  background: url(../../images/play-white.png), transparent !important;
+  background-repeat: no-repeat !important;
+  background-position: 20px 5px !important;
+  color: #ffffff !important;
+  padding-left: 20px !important;
+  border: 0 !important;
+}
+
+.actions-sound-modal .buttons-sound-modal button.stop,
+.actions-sound-modal .buttons-sound-modal input[type="button"].stop {
+  background: url(../../images/stop.png), var(--primary-color);
+  background-repeat: no-repeat;
+  background-position: 82px 14px;
+  color: #ffffff;
+  padding-left: 20px;
+  border: 0;
+}
+
+.actions-sound-modal .buttons-sound-modal div.stop {
+  background: url(../../images/stop.png), transparent !important;
+  background-repeat: no-repeat !important;
+  background-position: 20px 5px !important;
+  color: #ffffff !important;
+  padding-left: 20px !important;
+  border: 0 !important;
+}
+
+.start-end-date-log-viewer {
+  display: flex;
+  flex-direction: row !important;
+  flex-wrap: nowrap;
+  justify-content: flex-start !important;
+}
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 652d777f72..a37b5ad4dc 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -20,6 +20,13 @@ Description: The default Pandora FMS theme layout
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+:root {
+  /* --primary-color: #14524f; */
+  --secondary-color: #222;
+  --text-color: #fff;
+  /* --input-border: #c0ccdc; */
+  --border-color: #484848;
+}
 
 /* General styles */
 body,
diff --git a/pandora_console/include/styles/sound_events.css b/pandora_console/include/styles/sound_events.css
index 3b36dc67a2..b5d309e5bb 100644
--- a/pandora_console/include/styles/sound_events.css
+++ b/pandora_console/include/styles/sound_events.css
@@ -216,10 +216,10 @@ div.container-button-play > button#button-start-search {
 
 .actions-sound-modal .buttons-sound-modal button.play,
 .actions-sound-modal .buttons-sound-modal input[type="button"].play {
-  background: url(../../images/play-white.png), transparent;
-  background-repeat: no-repeat;
-  background-position: 82px 14px;
-  color: #ffffff;
+  background: url(../../images/play-white.png), transparent !important;
+  background-repeat: no-repeat !important;
+  background-position: 82px 14px !important;
+  color: #ffffff !important;
   padding-left: 20px;
   border: 0;
 }
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 562ffc3c80..6974aed9e8 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -237,7 +237,8 @@
 .table_action_buttons > img,
 .table_action_buttons > button,
 .table_action_buttons > form,
-.table_action_buttons > div {
+.table_action_buttons > div,
+.table_action_buttons .action_button_hidden {
   visibility: hidden;
 }
 .info_table > tbody > tr:hover {
@@ -250,7 +251,8 @@
 .info_table > tbody > tr:hover .table_action_buttons > img,
 .info_table > tbody > tr:hover .table_action_buttons > button,
 .info_table > tbody > tr:hover .table_action_buttons > form,
-.info_table > tbody > tr:hover .table_action_buttons > div {
+.info_table > tbody > tr:hover .table_action_buttons > div,
+.info_table > tbody > tr:hover .table_action_buttons .action_button_hidden {
   visibility: visible;
 }
 
@@ -381,15 +383,35 @@ a.pandora_pagination.current:hover {
   cursor: pointer;
 }
 
+.dt-button.buttons-csv.buttons-html5.mini-csv-button {
+  background-image: url(../../images/file-csv.svg);
+  background-position: 4px center;
+  height: 26px;
+  width: 31px;
+  margin-left: 10px;
+  box-shadow: 0px 0px 0px #00000000;
+  border: 0px;
+  border-radius: 0px;
+}
+
 .dt-button.buttons-csv.buttons-html5:hover {
   color: #1d7873 !important;
   border: 2px solid #1d7873 !important;
 }
 
+.dt-button.buttons-csv.buttons-html5.mini-csv-button:hover {
+  color: #00000000 !important;
+  border: 0px !important;
+}
+
 .dt-button.buttons-csv.buttons-html5:before {
   content: "csv";
 }
 
+.dt-button.buttons-csv.buttons-html5.mini-csv-button:before {
+  content: "";
+}
+
 .dt-button.buttons-csv.buttons-html5 span {
   font-size: 0;
 }
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 75c00af9b1..3a7a9e21ec 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -292,7 +292,7 @@ enterprise_include_once('include/auth/saml.php');
 if (isset($config['id_user']) === false) {
     // Clear error messages.
     unset($_COOKIE['errormsg']);
-    setcookie('errormsg', null, -1);
+    setcookie('errormsg', '', -1);
 
     if (isset($_GET['login']) === true) {
         include_once 'include/functions_db.php';
@@ -1610,7 +1610,7 @@ require 'include/php_to_js_values.php';
 
                     $(".ui-widget-overlay").css("background", "#000");
                     $(".ui-widget-overlay").css("opacity", 0.6);
-                    $(".ui-draggable").css("cursor", "inherit");
+                    //$(".ui-draggable").css("cursor", "inherit");
 
                 } catch (error) {
                     console.log(error);
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 548f57b24b..f4513d0bb4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.772';
-            $build = '230720';
+            $build = '230731';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index 9ed5784026..d27ff6db4c 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -496,6 +496,10 @@ table.event_details td.cell_event_name {
   font-size: 14px;
 }
 
+table.event_details td.cell_event_comments {
+  height: auto;
+}
+
 #validate_button {
   margin: 10px auto;
   padding: 0;
diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php
index 681de8445f..c03516f2d6 100644
--- a/pandora_console/mobile/operation/events.php
+++ b/pandora_console/mobile/operation/events.php
@@ -485,22 +485,16 @@ class Events
                                 $event['tags'] = '<i>'.__('N/A').'</i>';
                             }
 
-                            $event_comments = db_get_value(
-                                'user_comment',
-                                'tevento',
-                                'id_evento',
-                                $id_event
+                            $event_comments_array = db_get_all_rows_sql(
+                                sprintf(
+                                    'SELECT * FROM tevent_comment where id_event = %d',
+                                    $id_event
+                                )
                             );
-                            $event_comments_array = [];
-                            $event_comments_array = json_decode(
-                                $event_comments,
-                                true
-                            );
-                            // Support for new format only.
                             if (empty($event_comments_array) === true) {
                                 $comment = '<i>'.__('N/A').'</i>';
                             } else {
-                                $comment = '';
+                                $comment = '<div>';
                                 $event_comments_array = array_reverse(
                                     $event_comments_array
                                 );
@@ -521,6 +515,8 @@ class Events
                                     );
                                     $comment .= '<br>'.$c['comment'].'<br>';
                                 }
+
+                                $comment .= '</div>';
                             }
 
                             $event['comments'] = $comment;
diff --git a/pandora_console/mobile/operation/home.php b/pandora_console/mobile/operation/home.php
index 30a485d211..a841c995d4 100644
--- a/pandora_console/mobile/operation/home.php
+++ b/pandora_console/mobile/operation/home.php
@@ -60,15 +60,13 @@ class Home
             'icon'      => 'ui-icon-menu-group ui-widget-icon-floatbeginning ui-icon-menu-square',
         ];
 
-        if ((bool) $system->getConfig('legacy_vc', false) === false) {
-            // Show Visual consoles only if new system is enabled.
-            $items['visualmaps'] = [
-                'name'      => __('Visual consoles'),
-                'filename'  => 'visualmaps.php',
-                'menu_item' => true,
-                'icon'      => 'ui-icon-menu-visual_console ui-widget-icon-floatbeginning ui-icon-menu-square',
-            ];
-        }
+        // Show Visual consoles only if new system is enabled.
+        $items['visualmaps'] = [
+            'name'      => __('Visual consoles'),
+            'filename'  => 'visualmaps.php',
+            'menu_item' => true,
+            'icon'      => 'ui-icon-menu-visual_console ui-widget-icon-floatbeginning ui-icon-menu-square',
+        ];
 
         $items['alerts'] = [
             'name'      => __('Alerts'),
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 4db865990f..07974af99e 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -258,7 +258,8 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che
         );
     }
 
-    if ($print_agent === true) {
+    /*
+        if ($print_agent === true) {
         array_push(
             $column_names,
             ['text' => 'Agent']
@@ -268,11 +269,12 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che
             $columns,
             ['agent_name']
         );
-    }
+    }*/
 }
 
 array_push(
     $column_names,
+    ['text' => 'Agent'],
     ['text' => 'Module'],
     ['text' => 'Template'],
     [
@@ -286,6 +288,7 @@ array_push(
 
 $columns = array_merge(
     $columns,
+    ['agent_name'],
     ['agent_module_name'],
     ['template_name'],
     ['action'],
@@ -359,7 +362,7 @@ if ($agent_view_page === true) {
         [
             'id'                  => 'alerts_status_datatable',
             'class'               => 'info_table',
-            'style'               => 'width: 99%',
+            'style'               => 'width: 100%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'no_sortable_columns' => $no_sortable_columns,
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 540cd8c173..52c376b4f7 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -256,152 +256,164 @@ if ($new_networkmap || $save_networkmap) {
 
         $name = (string) get_parameter('name');
 
-        // Default size values.
-        $width = $config['networkmap_max_width'];
-        $height = $config['networkmap_max_width'];
-
-        $method = (string) get_parameter('method', 'fdp');
-
-        $recon_task_id = (int) get_parameter(
-            'recon_task_id',
-            0
+        $exist = db_get_row_filter(
+            'tmap',
+            [
+                'name'         => $name,
+                'id_group_map' => $id_group_map,
+            ],
         );
-        $ip_mask = get_parameter(
-            'ip_mask',
-            ''
-        );
-        $source = (string) get_parameter('source', 'group');
-        $dont_show_subgroups = (int) get_parameter_checkbox(
-            'dont_show_subgroups',
-            0
-        );
-        $node_radius = (int) get_parameter('node_radius', 40);
-        $description = get_parameter('description', '');
 
-        $offset_x = get_parameter('pos_x', 0);
-        $offset_y = get_parameter('pos_y', 0);
-        $scale_z = get_parameter('scale_z', 0.5);
+        if ($exist !== false) {
+            $result_txt = ui_print_error_message(__('Another network map already exists with this name and group.'));
+        } else {
+            // Default size values.
+            $width = $config['networkmap_max_width'];
+            $height = $config['networkmap_max_width'];
 
-        $node_sep = get_parameter('node_sep', '0.25');
-        $rank_sep = get_parameter('rank_sep', ($method === 'twopi') ? '1.0' : '0.5');
+            $method = (string) get_parameter('method', 'fdp');
 
-        $mindist = get_parameter('mindist', '1.0');
-        $kval = get_parameter('kval', '0.3');
-
-        $refresh_time = get_parameter('refresh_time', '300');
-
-        $values = [];
-        $values['name'] = $name;
-        $values['id_group'] = implode(',', $id_group);
-        $values['source_period'] = 60;
-        $values['width'] = $width;
-        $values['height'] = $height;
-        $values['id_user'] = $config['id_user'];
-        $values['description'] = $description;
-        $values['id_group_map'] = $id_group_map;
-        $values['refresh_time'] = $refresh_time;
-
-        switch ($method) {
-            case 'twopi':
-                $values['generation_method'] = LAYOUT_RADIAL;
-            break;
-
-            case 'dot':
-                $values['generation_method'] = LAYOUT_FLAT;
-            break;
-
-            case 'circo':
-                $values['generation_method'] = LAYOUT_CIRCULAR;
-            break;
-
-            case 'neato':
-                $values['generation_method'] = LAYOUT_SPRING1;
-            break;
-
-            case 'fdp':
-                $values['generation_method'] = LAYOUT_SPRING2;
-            break;
-
-            case 'radial_dinamic':
-                $values['generation_method'] = LAYOUT_RADIAL_DYNAMIC;
-            break;
-
-            default:
-                $values['generation_method'] = LAYOUT_RADIAL;
-            break;
-        }
-
-        if ($source == 'group') {
-            $values['source'] = 0;
-            $values['source_data'] = implode(',', $id_group);
-        } else if ($source == 'recon_task') {
-            $values['source'] = 1;
-            $values['source_data'] = $recon_task_id;
-        } else if ($source == 'ip_mask') {
-            $values['source'] = 2;
-            $values['source_data'] = $ip_mask;
-        }
-
-        if ($networkmap_write === false && $networkmap_manage === false) {
-            db_pandora_audit(
-                AUDIT_LOG_ACL_VIOLATION,
-                'Trying to access networkmap'
+            $recon_task_id = (int) get_parameter(
+                'recon_task_id',
+                0
             );
-            include 'general/noaccess.php';
-            return;
-        }
-
-        $filter = [];
-        $filter['dont_show_subgroups'] = $dont_show_subgroups;
-        $filter['node_radius'] = $node_radius;
-        $filter['x_offs'] = $offset_x;
-        $filter['y_offs'] = $offset_y;
-        $filter['z_dash'] = $scale_z;
-        $filter['node_sep'] = $node_sep;
-        $filter['rank_sep'] = $rank_sep;
-        $filter['mindist'] = $mindist;
-        $filter['kval'] = $kval;
-
-        $values['filter'] = json_encode($filter);
-
-        $result = false;
-        if (!empty($name)) {
-            $result = db_process_sql_insert(
-                'tmap',
-                $values
+            $ip_mask = get_parameter(
+                'ip_mask',
+                ''
             );
-        }
+            $source = (string) get_parameter('source', 'group');
+            $dont_show_subgroups = (int) get_parameter_checkbox(
+                'dont_show_subgroups',
+                0
+            );
+            $node_radius = (int) get_parameter('node_radius', 40);
+            $description = get_parameter('description', '');
 
-        $result_txt = ui_print_result_message(
-            $result,
-            __('Succesfully created'),
-            __('Could not be created'),
-            '',
-            true
-        );
+            $offset_x = get_parameter('pos_x', 0);
+            $offset_y = get_parameter('pos_y', 0);
+            $scale_z = get_parameter('scale_z', 0.5);
 
-        $id = $result;
-        define('_id_', $id);
+            $node_sep = get_parameter('node_sep', '0.25');
+            $rank_sep = get_parameter('rank_sep', ($method === 'twopi') ? '1.0' : '0.5');
 
-        if ($result !== false) {
-            $tab = 'view';
-            if ($values['generation_method'] == LAYOUT_RADIAL_DYNAMIC) {
-                $tab = 'r_dinamic';
-                define('_activeTab_', 'radial_dynamic');
-                $url = 'index.php?sec=network&sec2=operation/agentes/networkmap.dinamic&activeTab=radial_dynamic';
-                header(
-                    'Location: '.ui_get_full_url(
-                        $url.'&id_networkmap='.$id
-                    )
+            $mindist = get_parameter('mindist', '1.0');
+            $kval = get_parameter('kval', '0.3');
+
+            $refresh_time = get_parameter('refresh_time', '300');
+
+            $values = [];
+            $values['name'] = $name;
+            $values['id_group'] = implode(',', $id_group);
+            $values['source_period'] = 60;
+            $values['width'] = $width;
+            $values['height'] = $height;
+            $values['id_user'] = $config['id_user'];
+            $values['description'] = $description;
+            $values['id_group_map'] = $id_group_map;
+            $values['refresh_time'] = $refresh_time;
+
+            switch ($method) {
+                case 'twopi':
+                    $values['generation_method'] = LAYOUT_RADIAL;
+                break;
+
+                case 'dot':
+                    $values['generation_method'] = LAYOUT_FLAT;
+                break;
+
+                case 'circo':
+                    $values['generation_method'] = LAYOUT_CIRCULAR;
+                break;
+
+                case 'neato':
+                    $values['generation_method'] = LAYOUT_SPRING1;
+                break;
+
+                case 'fdp':
+                    $values['generation_method'] = LAYOUT_SPRING2;
+                break;
+
+                case 'radial_dinamic':
+                    $values['generation_method'] = LAYOUT_RADIAL_DYNAMIC;
+                break;
+
+                default:
+                    $values['generation_method'] = LAYOUT_RADIAL;
+                break;
+            }
+
+            if ($source == 'group') {
+                $values['source'] = 0;
+                $values['source_data'] = implode(',', $id_group);
+            } else if ($source == 'recon_task') {
+                $values['source'] = 1;
+                $values['source_data'] = $recon_task_id;
+            } else if ($source == 'ip_mask') {
+                $values['source'] = 2;
+                $values['source_data'] = $ip_mask;
+            }
+
+            if ($networkmap_write === false && $networkmap_manage === false) {
+                db_pandora_audit(
+                    AUDIT_LOG_ACL_VIOLATION,
+                    'Trying to access networkmap'
                 );
-            } else {
-                $url = 'index.php?sec=network&sec2=operation/agentes/pandora_networkmap';
-                header(
-                    'Location: '.ui_get_full_url(
-                        $url.'&tab='.$tab.'&id_networkmap='.$id
-                    )
+                include 'general/noaccess.php';
+                return;
+            }
+
+            $filter = [];
+            $filter['dont_show_subgroups'] = $dont_show_subgroups;
+            $filter['node_radius'] = $node_radius;
+            $filter['x_offs'] = $offset_x;
+            $filter['y_offs'] = $offset_y;
+            $filter['z_dash'] = $scale_z;
+            $filter['node_sep'] = $node_sep;
+            $filter['rank_sep'] = $rank_sep;
+            $filter['mindist'] = $mindist;
+            $filter['kval'] = $kval;
+
+            $values['filter'] = json_encode($filter);
+
+            $result = false;
+            if (!empty($name)) {
+                $result = db_process_sql_insert(
+                    'tmap',
+                    $values
                 );
             }
+
+            $result_txt = ui_print_result_message(
+                $result,
+                __('Succesfully created'),
+                __('Could not be created'),
+                '',
+                true
+            );
+
+            $id = $result;
+            define('_id_', $id);
+
+            if ($result !== false) {
+                $tab = 'view';
+                if ($values['generation_method'] == LAYOUT_RADIAL_DYNAMIC) {
+                    $tab = 'r_dinamic';
+                    define('_activeTab_', 'radial_dynamic');
+                    $url = 'index.php?sec=network&sec2=operation/agentes/networkmap.dinamic&activeTab=radial_dynamic';
+                    header(
+                        'Location: '.ui_get_full_url(
+                            $url.'&id_networkmap='.$id
+                        )
+                    );
+                } else {
+                    $url = 'index.php?sec=network&sec2=operation/agentes/pandora_networkmap';
+                    header(
+                        'Location: '.ui_get_full_url(
+                            $url.'&tab='.$tab.'&id_networkmap='.$id
+                        )
+                    );
+                }
+            }
         }
     }
 }
@@ -464,70 +476,81 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
         }
 
         $name = (string) get_parameter('name', '');
-
-        $recon_task_id = (int) get_parameter(
-            'recon_task_id',
-            0
+        $exist = db_get_row_filter(
+            'tmap',
+            [
+                'name'         => $name,
+                'id_group_map' => $id_group_map,
+            ],
         );
 
-        $source = (string) get_parameter('source', 'group');
-
-        $offset_x = get_parameter('pos_x', 0);
-        $offset_y = get_parameter('pos_y', 0);
-        $scale_z = get_parameter('scale_z', 0.5);
-
-        $refresh_time = get_parameter('refresh_time', '300');
-
-        $values = [];
-        $values['name'] = $name;
-        $values['id_group'] = implode(',', $id_group);
-        $values['id_group_map'] = $id_group_map;
-
-        $description = get_parameter('description', '');
-        $values['description'] = $description;
-
-        $values['refresh_time'] = $refresh_time;
-
-        $dont_show_subgroups = (int) get_parameter('dont_show_subgroups', 0);
-        $node_radius = (int) get_parameter('node_radius', 40);
-        $row = db_get_row('tmap', 'id', $id);
-        $filter = json_decode($row['filter'], true);
-        $filter['dont_show_subgroups'] = $dont_show_subgroups;
-        $filter['node_radius'] = $node_radius;
-        $filter['x_offs'] = $offset_x;
-        $filter['y_offs'] = $offset_y;
-        $filter['z_dash'] = $scale_z;
-
-        $values['filter'] = json_encode($filter);
-
-        $result = false;
-        if (empty($name) === false) {
-            $result = db_process_sql_update(
-                'tmap',
-                $values,
-                ['id' => $id]
+        if ($exist !== false) {
+            $result_txt = ui_print_error_message(__('Another network map already exists with this name and group.'));
+        } else {
+            $recon_task_id = (int) get_parameter(
+                'recon_task_id',
+                0
             );
-            ui_update_name_fav_element($id, 'Network_map', $name);
-        }
 
-        $result_txt = ui_print_result_message(
-            $result,
-            __('Succesfully updated'),
-            __('Could not be updated'),
-            '',
-            true
-        );
+            $source = (string) get_parameter('source', 'group');
 
-        if ($result) {
-            // If change the group, the map must be regenerated
-            if ($id_group != $id_group_old) {
-                networkmap_delete_nodes($id);
-                // Delete relations.
-                networkmap_delete_relations($id);
+            $offset_x = get_parameter('pos_x', 0);
+            $offset_y = get_parameter('pos_y', 0);
+            $scale_z = get_parameter('scale_z', 0.5);
+
+            $refresh_time = get_parameter('refresh_time', '300');
+
+            $values = [];
+            $values['name'] = $name;
+            $values['id_group'] = implode(',', $id_group);
+            $values['id_group_map'] = $id_group_map;
+
+            $description = get_parameter('description', '');
+            $values['description'] = $description;
+
+            $values['refresh_time'] = $refresh_time;
+
+            $dont_show_subgroups = (int) get_parameter('dont_show_subgroups', 0);
+            $node_radius = (int) get_parameter('node_radius', 40);
+            $row = db_get_row('tmap', 'id', $id);
+            $filter = json_decode($row['filter'], true);
+            $filter['dont_show_subgroups'] = $dont_show_subgroups;
+            $filter['node_radius'] = $node_radius;
+            $filter['x_offs'] = $offset_x;
+            $filter['y_offs'] = $offset_y;
+            $filter['z_dash'] = $scale_z;
+
+            $values['filter'] = json_encode($filter);
+
+            $result = false;
+            if (empty($name) === false) {
+                $result = db_process_sql_update(
+                    'tmap',
+                    $values,
+                    ['id' => $id]
+                );
+                ui_update_name_fav_element($id, 'Network_map', $name);
             }
 
-            $networkmap_write = $networkmap_write_new;
-            $networkmap_manage = $networkmap_manage_new;
+            $result_txt = ui_print_result_message(
+                $result,
+                __('Succesfully updated'),
+                __('Could not be updated'),
+                '',
+                true
+            );
+
+            if ($result) {
+                // If change the group, the map must be regenerated
+                if ($id_group != $id_group_old) {
+                    networkmap_delete_nodes($id);
+                    // Delete relations.
+                    networkmap_delete_relations($id);
+                }
+
+                $networkmap_write = $networkmap_write_new;
+                $networkmap_manage = $networkmap_manage_new;
+            }
         }
     }
 
diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index f7744056bd..103d65f85c 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -223,10 +223,6 @@ if ($id_extra != '') {
     $sql_post .= " AND id_extra LIKE '%$id_extra%'";
 }
 
-if ($user_comment != '') {
-    $sql_post .= " AND user_comment LIKE '%$user_comment%'";
-}
-
 if ($source != '') {
     $sql_post .= " AND source LIKE '%$source%'";
 }
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 92f1875513..0152fea782 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -104,6 +104,9 @@ if (isset($fb64) === true) {
     );
 }
 
+$settings_modal = get_parameter('settings', 0);
+$parameters_modal = get_parameter('parameters', 0);
+
 $id_group_filter = get_parameter(
     'filter[id_group_filter]',
     ($filter['id_group_filter'] ?? '')
@@ -330,7 +333,7 @@ if (is_ajax() === true) {
     $groupRecursion = (bool) get_parameter('groupRecursion', false);
 
     // Datatables offset, limit.
-    $start = get_parameter('start', 0);
+    $start = (int) get_parameter('start', 0);
     $length = get_parameter(
         'length',
         $config['block_size']
@@ -372,13 +375,6 @@ if (is_ajax() === true) {
                 'ta.direccion',
             ];
 
-            if (strpos($config['event_fields'], 'user_comment') !== false
-                || empty($user_comment) === false
-                || empty($search) === false
-            ) {
-                $fields[] = 'te.user_comment';
-            }
-
             $order = get_datatable_order(true);
 
             if (is_array($order) === true && $order['field'] === 'mini_severity') {
@@ -466,7 +462,7 @@ if (is_ajax() === true) {
 
                 $data = array_reduce(
                     $events,
-                    function ($carry, $item) use ($table_id, &$redirection_form_id) {
+                    function ($carry, $item) use ($table_id, &$redirection_form_id, $filter) {
                         global $config;
 
                         $tmp = (object) $item;
@@ -493,23 +489,52 @@ if (is_ajax() === true) {
                             }
                         }
 
+                        if (strlen($tmp->server_name) >= 10) {
+                            $tmp->server_name = ui_print_truncate_text(
+                                $tmp->server_name,
+                                10,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
+                        }
+
                         $tmp->evento = str_replace('"', '', io_safe_output($tmp->evento));
-                        if (strlen($tmp->evento) >= 255) {
+                        $event_text = $tmp->evento;
+                        if (strlen($tmp->evento) >= 40) {
                             $tmp->evento = ui_print_truncate_text(
                                 $tmp->evento,
-                                255,
-                                $tmp->evento,
+                                40,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
                                 true,
-                                false
                             );
                         }
 
                         if (empty($tmp->module_name) === false) {
                             $tmp->module_name = io_safe_output($tmp->module_name);
+                            if (strlen($tmp->module_name) >= 20) {
+                                $tmp->module_name = ui_print_truncate_text(
+                                    $tmp->module_name,
+                                    20,
+                                    false,
+                                    true,
+                                    false,
+                                    '&hellip;',
+                                    true,
+                                    true,
+                                );
+                            }
                         }
 
                         if (empty($tmp->comments) === false) {
-                            $tmp->comments = ui_print_comments($tmp->comments);
+                            $tmp->comments = ui_print_comments($tmp->comments, 20);
                         }
 
                         // Show last event.
@@ -535,6 +560,32 @@ if (is_ajax() === true) {
                         }
 
                         $tmp->agent_name = io_safe_output($tmp->agent_name);
+                        if (strlen($tmp->agent_name) >= 10) {
+                            $tmp->agent_name = ui_print_truncate_text(
+                                $tmp->agent_name,
+                                10,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
+                        }
+
+                        $tmp->id_extra = io_safe_output($tmp->id_extra);
+                        if (strlen($tmp->id_extra) >= 10) {
+                            $tmp->id_extra = ui_print_truncate_text(
+                                $tmp->id_extra,
+                                10,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
+                        }
 
                         $tmp->ack_utimestamp_raw = $tmp->ack_utimestamp;
 
@@ -557,7 +608,7 @@ if (is_ajax() === true) {
 
                                 $total_sec = strtotime($tmp->timestamp);
                                 $total_sec += $dif;
-                                $last_contact = date($config['date_format'], $total_sec);
+                                $last_contact = date($confb64ig['date_format'], $total_sec);
                                 $last_contact_value = ui_print_timestamp($last_contact, true);
                             } else {
                                 $title = date($config['date_format'], strtotime($tmp->timestamp));
@@ -583,29 +634,31 @@ if (is_ajax() === true) {
                         }
 
                         $tmp->instructions = events_get_instructions($item);
-
-                        $tmp->b64 = base64_encode(json_encode($tmp));
-
-                        // Show comments events.
-                        if (empty($tmp->comments) === false) {
-                            $tmp->user_comment = $tmp->comments;
-                            if ($tmp->comments !== 'undefined' && strlen($tmp->comments) > 80) {
-                                $tmp->user_comment .= '&nbsp;&nbsp;';
-                                $tmp->user_comment .= '<a id="show_comments" href="javascript:" onclick="show_event_dialog(\'';
-                                $tmp->user_comment .= $tmp->b64;
-                                $tmp->user_comment .= '\',\'comments\')>;';
-                                $tmp->user_comment .= html_print_image(
-                                    'images/details.svg',
-                                    true,
-                                    [
-                                        'title' => __('Show more'),
-                                        'class' => 'invert_filter main_menu_icon',
-                                    ]
-                                );
-                                $tmp->user_comment .= '</a>';
-                            }
+                        if (strlen($tmp->instructions) >= 20) {
+                            $tmp->instructions = ui_print_truncate_text(
+                                $tmp->instructions,
+                                20,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
                         }
 
+                        $aux_event = $tmp->evento;
+                        $tmp->evento = $event_text;
+                        $tmp->b64 = base64_encode(json_encode($tmp));
+                        $tmp->evento = $aux_event;
+
+                        $tmp->user_comment = ui_print_comments(
+                            event_get_last_comment(
+                                $item,
+                                $filter
+                            )
+                        );
+
                         // Grouped events.
                         if (isset($tmp->max_id_evento) === true
                             && empty($tmp->max_id_evento) === false
@@ -675,8 +728,15 @@ if (is_ajax() === true) {
                         $evn = '<a href="javascript:" onclick="show_event_dialog(\''.$tmp->b64.'\')">';
 
                         // Grouped events.
-                        if (isset($tmp->event_rep) === true && $tmp->event_rep > 1) {
-                            $evn .= '('.$tmp->event_rep.') ';
+                        if ((int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) {
+                            $counter_extra_id = event_get_counter_extraId($item, $filter);
+                            if (empty($counter_extra_id) === false && $counter_extra_id > 1) {
+                                $evn .= '('.$counter_extra_id.') ';
+                            }
+                        } else {
+                            if (isset($tmp->event_rep) === true && $tmp->event_rep > 1) {
+                                $evn .= '('.$tmp->event_rep.') ';
+                            }
                         }
 
                         $evn .= $tmp->evento.'</a>';
@@ -844,6 +904,19 @@ if (is_ajax() === true) {
                             $tmp->owner_user = get_user_fullname($tmp->owner_user).' ('.$tmp->owner_user.')';
                         }
 
+                        if (strlen($tmp->owner_user) >= 10) {
+                            $tmp->owner_user = ui_print_truncate_text(
+                                $tmp->owner_user,
+                                10,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
+                        }
+
                         // Group name.
                         if (empty($tmp->id_grupo) === true) {
                             $tmp->id_grupo = __('All');
@@ -851,8 +924,33 @@ if (is_ajax() === true) {
                             $tmp->id_grupo = $tmp->group_name;
                         }
 
+                        if (strlen($tmp->id_grupo) >= 10) {
+                            $tmp->id_grupo = ui_print_truncate_text(
+                                $tmp->id_grupo,
+                                10,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
+                        }
+
                         // Module name.
                         $tmp->id_agentmodule = $tmp->module_name;
+                        if (strlen($tmp->id_agentmodule) >= 10) {
+                            $tmp->id_agentmodule = ui_print_truncate_text(
+                                $tmp->id_agentmodule,
+                                10,
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
+                        }
 
                         // Options.
                         // Show more.
@@ -1083,6 +1181,18 @@ if (is_ajax() === true) {
                             }
 
                             $tmp->custom_data = $custom_data_str;
+                            if (strlen($tmp->custom_data) >= 20) {
+                                $tmp->custom_data = ui_print_truncate_text(
+                                    $tmp->custom_data,
+                                    20,
+                                    false,
+                                    true,
+                                    false,
+                                    '&hellip;',
+                                    true,
+                                    true,
+                                );
+                            }
                         }
 
                         $carry[] = $tmp;
@@ -1598,6 +1708,11 @@ if ($pure) {
 
     // Acoustic console.
     $sound_event['active'] = false;
+    if (is_metaconsole() === true) {
+        $urlSound = '../../include/sounds/';
+    } else {
+        $urlSound = 'include/sounds/';
+    }
 
     // Sound Events.
     $data_sound = base64_encode(
@@ -1610,7 +1725,7 @@ if ($pure) {
                 'silenceAlarm' => __('Silence alarm'),
                 'url'          => ui_get_full_url('ajax.php'),
                 'page'         => 'include/ajax/events',
-                'urlSound'     => 'include/sounds/',
+                'urlSound'     => $urlSound,
             ]
         )
     );
@@ -1624,6 +1739,8 @@ if ($pure) {
         ]
     ).'</a>';
 
+    echo '<input type="hidden" id="open_sound_event_modal" value="0" /> ';
+
     // If the user has administrator permission display manage tab.
     if ($event_w === true || $event_m === true) {
         // Manage events.
@@ -2417,7 +2534,7 @@ try {
     if (in_array('instructions', $fields) > 0) {
         $fields[array_search('instructions', $fields)] = [
             'text'  => 'instructions',
-            'class' => 'column-instructions',
+            'class' => 'column-instructions mw60px',
         ];
     }
 
@@ -2431,10 +2548,17 @@ try {
 
     $comment_id = array_search('user_comment', $fields);
     if ($comment_id !== false) {
-        $fields[$comment_id] = [
-            'text'  => 'user_comment',
-            'class' => 'nowrap_max180px',
-        ];
+        $fields[$comment_id] = ['text' => 'user_comment'];
+    }
+
+
+    foreach ($fields as $key => $field) {
+        if (is_array($field) === false) {
+            $fields[$key] = [
+                'text'  => $field,
+                'class' => 'mw100px',
+            ];
+        }
     }
 
     // Always add options column.
@@ -2462,6 +2586,7 @@ try {
         }
     }
 
+    // mw60px
     // Open current filter quick reference.
     $active_filters_div = '<div class="filter_summary">';
 
@@ -2560,7 +2685,7 @@ try {
                 [
                     'id'                             => $table_id,
                     'class'                          => 'info_table events',
-                    'style'                          => 'width: 99%;',
+                    'style'                          => 'width: 100%;',
                     'ajax_url'                       => 'operation/events/events',
                     'ajax_data'                      => [
                         'get_events' => 1,
@@ -2665,7 +2790,7 @@ if (check_acl(
         'submit_event_response',
         false,
         'execute_event_response(true);',
-        [ 'icon' => 'cog' ],
+        [ 'icon' => 'cog'],
         true
     );
 
@@ -2680,6 +2805,50 @@ if (check_acl(
         false,
         false
     );
+    if (is_metaconsole() === true) {
+        $urlSound = '../../include/sounds/';
+    } else {
+        $urlSound = 'include/sounds/';
+    }
+
+    // Acoustic console.
+    $data_sound = base64_encode(
+        json_encode(
+            [
+                'title'        => __('Acoustic console'),
+                'start'        => __('Start'),
+                'stop'         => __('Stop'),
+                'noAlert'      => __('No alert'),
+                'silenceAlarm' => __('Silence alarm'),
+                'url'          => ui_get_full_url('ajax.php'),
+                'page'         => 'include/ajax/events',
+                'urlSound'     => $urlSound,
+            ]
+        )
+    );
+
+    $elements .= html_print_button(
+        __('Sound Events'),
+        'sound_events_button',
+        false,
+        'openSoundEventsDialog("'.$data_sound.'")',
+        [
+            'icon'           => 'sound',
+            'style'          => 'margin-right: 25% !important',
+            'minimize-arrow' => true,
+            'span_style'     => 'width: 100%',
+        ],
+        true
+    );
+
+    $elements .= html_print_button(
+        'hidden',
+        'sound_events_button_hidden',
+        false,
+        'openSoundEventModal("'.$data_sound.'")',
+        ['style' => 'display:none'],
+        true
+    );
 
     html_print_action_buttons(
         $elements,
@@ -3154,7 +3323,9 @@ $(document).ready( function() {
                     url: '<?php echo ui_get_full_url('ajax.php'); ?>',
                     data: {
                         page: 'include/ajax/events',
-                        load_filter_modal: 1
+                        load_filter_modal: 1,
+                        settings: '<?php echo $settings_modal; ?>',
+                        parameters: '<?php echo $parameters_modal; ?>',
                     },
                     success: function (data){
                         $('#load-modal-filter')
diff --git a/pandora_console/operation/events/events_rss.php b/pandora_console/operation/events/events_rss.php
index 4329910db9..aad21015fb 100644
--- a/pandora_console/operation/events/events_rss.php
+++ b/pandora_console/operation/events/events_rss.php
@@ -237,7 +237,6 @@ $column_names = [
     'id_agentmodule',
     'id_alert_am',
     'criticity',
-    'user_comment',
     'tags',
     'source',
     'id_extra',
@@ -266,7 +265,6 @@ $fields = [
     'am.nombre as module_name',
     'te.id_alert_am',
     'te.criticity',
-    'te.user_comment',
     'te.tags',
     'te.source',
     'te.id_extra',
diff --git a/pandora_console/operation/events/export_csv.php b/pandora_console/operation/events/export_csv.php
index 98062ffab9..d820b8302a 100644
--- a/pandora_console/operation/events/export_csv.php
+++ b/pandora_console/operation/events/export_csv.php
@@ -70,7 +70,6 @@ $column_names = [
     'id_agentmodule',
     'id_alert_am',
     'criticity',
-    'user_comment',
     'tags',
     'source',
     'id_extra',
@@ -99,7 +98,6 @@ if (is_metaconsole() === true) {
         'te.id_agentmodule',
         'te.id_alert_am',
         'te.criticity',
-        'te.user_comment',
         'te.tags',
         'te.source',
         'te.id_extra',
@@ -129,7 +127,6 @@ if (is_metaconsole() === true) {
         'am.nombre as module_name',
         'te.id_alert_am',
         'te.criticity',
-        'te.user_comment',
         'te.tags',
         'te.source',
         'te.id_extra',
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 88508506d7..24179733e5 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -26,6 +26,7 @@
  * ============================================================================
  */
 
+
 require_once '../../include/config.php';
 require_once '../../include/functions.php';
 require_once '../../include/functions_db.php';
@@ -55,29 +56,34 @@ if (check_acl($config['id_user'], 0, 'ER') === false
     return;
 }
 
+if (is_metaconsole() === true) {
+    $redirect_metaconsole = '../../';
+} else {
+    $redirect_metaconsole = '';
+}
+
 echo '<html>';
 echo '<head>';
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo __('Acoustic console'); ?></title>
-<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/pandora_minimal.css" type="text/css" />
-<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/js/jquery-ui.min.css" type="text/css" />
-<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/js/jquery-ui_custom.css" type="text/css" />
-<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/select2.min.css" type="text/css" />
-<link rel="stylesheet" href="<?php echo $config['homeurl']; ?>include/styles/pandora.css" type="text/css" />
-<?php
+echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
+echo '<title>'.__('Acoustic console').'</title>';
+echo '<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />';
+echo '<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />';
+echo '<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css" type="text/css" />';
+echo '<link rel="stylesheet" href="../../include/styles/select2.min.css" type="text/css" />';
+echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />';
+
 echo ui_require_css_file('wizard', 'include/styles/', true);
 echo ui_require_css_file('discovery', 'include/styles/', true);
 echo ui_require_css_file('sound_events', 'include/styles/', true);
-?>
-<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/jquery.current.js'></script>
-<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/jquery.pandora.js'></script>
-<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/jquery-ui.min.js'></script>
-<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/select2.min.js'></script>
-<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/pandora.js'></script>
-<script type='text/javascript' src='<?php echo $config['homeurl']; ?>include/javascript/pandora_ui.js'></script>
 
-<?php
+echo '<script type="text/javascript" src="../../include/javascript/jquery.current.js"></script>';
+echo '<script type="text/javascript" src="../../include/javascript/jquery.pandora.js"></script>';
+echo '<script type="text/javascript" src="../../include/javascript/jquery-ui.min.js"></script>';
+echo '<script type="text/javascript" src="../../include/javascript/select2.min.js"></script>';
+echo '<script type="text/javascript" src="../../include/javascript/pandora.js"></script>';
+echo '<script type="text/javascript" src="../../include/javascript/pandora_ui.js"></script>';
+
+
 echo '<link rel="icon" href="../../'.ui_get_favicon().'" type="image/ico" />';
 if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css" />';
@@ -110,6 +116,7 @@ $output = '<div id="tabs-sound-modal">';
             [
                 'title' => __('Events list'),
                 'class' => 'invert_filter',
+                'div_sty'
             ]
         );
         $output .= '</a>';
@@ -242,7 +249,7 @@ $output = '<div id="tabs-sound-modal">';
         );
         $output .= '</div>';
 
-        $output .= '<div id="tabs-sound-modal-2">';
+        $output .= '<div id="tabs-sound-modal-2" style="height: 290px;">';
         $output .= '<h3 class="title-discovered-alerts">';
         $output .= __('Discovered alerts');
         $output .= '</h3>';
@@ -259,7 +266,7 @@ $output = '<div id="tabs-sound-modal">';
         $output .= __('Congrats! there’s nothing to show');
         $output .= '</span>';
         $output .= '</div>';
-        $output .= '<div class="elements-discovered-alerts"><ul></ul></div>';
+        $output .= '<div class="elements-discovered-alerts" style="max-height:250px !important;"><ul></ul></div>';
         $output .= html_print_input_hidden(
             'ajax_file_sound_console',
             ui_get_full_url('ajax.php', false, false, false),
@@ -284,7 +291,7 @@ $output = '<div id="tabs-sound-modal">';
             false,
             '',
             [
-                'icon'  => 'cog',
+                'icon'  => 'play',
                 'class' => 'mrgn_lft_20px',
             ],
             true
@@ -350,9 +357,9 @@ function action_events_sound(mode) {
         // Change mode.
         $("#hidden-mode_alert").val(1);
         // Change img button.
-        $("#button-start-search")
-        .removeClass("play")
-        .addClass("stop");
+        $("#button-start-search").children("div").removeClass("play")
+        $("#button-start-search").children("div").addClass("stop");
+
         // Change value button.
         $("#button-start-search").val("Stop");
         $("#button-start-search > span").text("Stop");
@@ -366,9 +373,8 @@ function action_events_sound(mode) {
         // Change mode.
         $("#hidden-mode_alert").val(0);
         // Change img button.
-        $("#button-start-search")
-        .removeClass("stop")
-        .addClass("play");
+        $("#button-start-search").children("div").removeClass("stop")
+        $("#button-start-search").children("div").addClass("play")
         // Change value button.
         $("#button-start-search").val("Start");
         $("#button-start-search > span").text("Start");
@@ -405,6 +411,7 @@ function add_audio(urlSound) {
 
 function remove_audio() {
     $(".actions-sound-modal audio").remove();
+    //buttonBlink();
 }
 
 function listen_event_sound() {
@@ -435,7 +442,6 @@ function check_event_sound() {
                 $("#tabs-sound-modal .empty-discovered-alerts").addClass(
                 "invisible_important"
                 );
-
                 // Change img button.
                 $("#button-no-alerts")
                 .removeClass("alerts")
@@ -446,10 +452,11 @@ function check_event_sound() {
 
                 // Background button.
                 $(".container-button-alert").addClass("fired");
-
+                
                 // Remove audio.
                 remove_audio();
                 var urlSound = '../../include/sounds/'+$('#sound_id :selected').val();
+                console.log(urlSound)
                 // Apend audio.
                 add_audio(urlSound);
 
@@ -505,7 +512,7 @@ $(document).ready(function(){
             sound = true;
         }
         var urlSound = '../../include/sounds/'+$('#sound_id :selected').val();
-
+        urlSound
         test_sound_button(sound, urlSound);
     });
 
@@ -516,7 +523,18 @@ $(document).ready(function(){
         if (mode == 0) {
             action = true;
         }
-
+        if ($("#button-start-search").hasClass("play")){
+            $("#modal-sound").css({
+                height: "500px"
+            });
+            $("#modal-sound").parent().css({
+                height: "800px"
+            });
+        } else {
+            $("#modal-sound").css({
+                height: "450px"
+            });
+        }
         action_events_sound(action);
     });
 
diff --git a/pandora_console/operation/inventory/inventory.php b/pandora_console/operation/inventory/inventory.php
index 63b302062c..536f470fe6 100755
--- a/pandora_console/operation/inventory/inventory.php
+++ b/pandora_console/operation/inventory/inventory.php
@@ -804,7 +804,7 @@ if ($inventory_module !== 'basic') {
                             [
                                 'id'                  => $id_table,
                                 'class'               => 'info_table w100p',
-                                'style'               => 'width: 99%',
+                                'style'               => 'width: 100%',
                                 'columns'             => $columns,
                                 'column_names'        => $columns,
                                 'no_sortable_columns' => [],
@@ -919,7 +919,7 @@ if ($inventory_module !== 'basic') {
                         [
                             'id'                  => $id_table,
                             'class'               => 'info_table w100p',
-                            'style'               => 'width: 99%',
+                            'style'               => 'width: 100%',
                             'columns'             => $columns,
                             'column_names'        => $columns,
                             'no_sortable_columns' => [],
@@ -1083,7 +1083,7 @@ if ($inventory_module !== 'basic') {
                         [
                             'id'                  => $id_table,
                             'class'               => 'info_table w100p',
-                            'style'               => 'width: 99%',
+                            'style'               => 'width: 100%',
                             'columns'             => $columns,
                             'column_names'        => $columns,
                             'no_sortable_columns' => [],
@@ -1173,7 +1173,7 @@ if ($inventory_module !== 'basic') {
                         [
                             'id'                  => $id_table,
                             'class'               => 'info_table w100p',
-                            'style'               => 'width: 99%',
+                            'style'               => 'width: 100%',
                             'columns'             => $columns,
                             'column_names'        => $columns,
                             'no_sortable_columns' => [],
@@ -1188,6 +1188,8 @@ if ($inventory_module !== 'basic') {
                             'emptyTable'          => __('No inventory found'),
                             'return'              => true,
                             'no_sortable_columns' => [],
+                            'mini_search'         => true,
+                            'mini_pagination'     => true,
                         ]
                     );
 
@@ -1204,7 +1206,7 @@ if ($inventory_module !== 'basic') {
                         [
                             'id'                          => $id_table,
                             'class'                       => 'info_table w100p',
-                            'style'                       => 'width: 99%',
+                            'style'                       => 'width: 100%',
                             'columns'                     => $columns,
                             'column_names'                => $columns,
                             'no_sortable_columns'         => [],
@@ -1233,7 +1235,7 @@ if ($inventory_module !== 'basic') {
     $agentes = [];
     $data = [];
     $class = 'info_table';
-    $style = 'width: 99%';
+    $style = 'width: 100%';
     $ordering = true;
     $searching = false;
 
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 3641a79f80..123a7e63e8 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -563,6 +563,12 @@ if ($access_console_node === true) {
             $sub['operation/events/events_rss.php?user='.$config['id_user'].'&amp;hashup='.$hashup.'&fb64='.$fb64]['type'] = 'direct';
         }
 
+        if (is_metaconsole() === true) {
+            $urlSound = '../../include/sounds/';
+        } else {
+            $urlSound = 'include/sounds/';
+        }
+
         // Acoustic console.
         $data_sound = base64_encode(
             json_encode(
@@ -574,7 +580,7 @@ if ($access_console_node === true) {
                     'silenceAlarm' => __('Silence alarm'),
                     'url'          => ui_get_full_url('ajax.php'),
                     'page'         => 'include/ajax/events',
-                    'urlSound'     => 'include/sounds/',
+                    'urlSound'     => $urlSound,
                 ]
             )
         );
diff --git a/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php
index 0330f117c4..ae55cff765 100755
--- a/pandora_console/operation/visual_console/public_console.php
+++ b/pandora_console/operation/visual_console/public_console.php
@@ -15,13 +15,8 @@
 // The session is configured and started inside the config process.
 require_once '../../include/config.php';
 
-$legacy = (bool) get_parameter('legacy', $config['legacy_vc']);
 if (is_metaconsole() === true) {
     $config['requirements_use_base_url'] = true;
 }
 
-if ($legacy === false) {
-    include_once $config['homedir'].'/operation/visual_console/public_view.php';
-} else {
-    include_once $config['homedir'].'/operation/visual_console/legacy_public_view.php';
-}
+require_once $config['homedir'].'/operation/visual_console/public_view.php';
diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index f1b1d70f91..33c52a62b9 100755
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -13,9 +13,4 @@
 // GNU General Public License for more details.
 global $config;
 
-$legacy = (bool) get_parameter('legacy', $config['legacy_vc']);
-if ($legacy === false) {
-    include_once $config['homedir'].'/operation/visual_console/view.php';
-} else {
-    include_once $config['homedir'].'/operation/visual_console/legacy_view.php';
-}
+require_once $config['homedir'].'/operation/visual_console/view.php';
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 107d3a3b0e..8ae8698e3f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.772
-%define release     230720
+%define release     230731
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
@@ -15,7 +15,7 @@ Name:               %{name}
 Version:            %{version}
 Release:            %{release}
 License:            GPL
-Vendor:             Artica ST <info@artica.es>
+Vendor:             Pandora FMS <info@pandorafms.com>
 #Source0:            %{name}-%{version}-%{revision}.tar.gz
 Source0:            %{name}-%{version}.tar.gz
 URL:                http://www.pandorafms.com
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 2d9284514f..fda8acf24b 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.772
-%define release     230720
+%define release     230731
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
@@ -15,7 +15,7 @@ Name:               %{name}
 Version:            %{version}
 Release:            %{release}
 License:            GPL
-Vendor:             Artica ST <info@artica.es>
+Vendor:             Pandora FMS <info@pandorafms.com>
 #Source0:            %{name}-%{version}-%{revision}.tar.gz
 Source0:            %{name}-%{version}.tar.gz
 URL:                http://www.pandorafms.com
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 4c174430f7..b90c8cc19b 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.772
-%define release     230720
+%define release     230731
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
@@ -18,7 +18,7 @@ Name:               %{name}
 Version:            %{version}
 Release:            %{release}
 License:            GPL
-Vendor:             Artica ST <info@artica.es>
+Vendor:             Pandora FMS <info@pandorafms.com>
 Source0:            %{name}-%{version}.tar.gz
 URL:                http://www.pandorafms.org
 Group:              System/Monitoring
diff --git a/pandora_console/pandora_websocket_engine b/pandora_console/pandora_websocket_engine
index 6b87c75763..2d4536aae0 100755
--- a/pandora_console/pandora_websocket_engine
+++ b/pandora_console/pandora_websocket_engine
@@ -39,7 +39,7 @@ if [[ -z ${PANDORA_RB_PRODUCT_NAME} ]]; then
 	PANDORA_RB_PRODUCT_NAME="Pandora FMS"
 fi
 if [[ -z ${PANDORA_RB_COPYRIGHT_NOTICE} ]]; then
-	PANDORA_RB_COPYRIGHT_NOTICE="Artica ST"
+	PANDORA_RB_COPYRIGHT_NOTICE="Pandora FMS"
 fi
 
 export PANDORA_RB_PRODUCT_NAME=$PANDORA_RB_PRODUCT_NAME
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 87f6283152..440199f901 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -706,7 +706,6 @@ CREATE TABLE IF NOT EXISTS `tevento` (
   `id_agentmodule` INT NOT NULL DEFAULT 0,
   `id_alert_am` INT NOT NULL DEFAULT 0,
   `criticity` INT UNSIGNED NOT NULL DEFAULT 0,
-  `user_comment` TEXT,
   `tags` TEXT,
   `source` TINYTEXT,
   `id_extra` TINYTEXT,
@@ -743,6 +742,20 @@ CREATE TABLE IF NOT EXISTS `tevent_extended` (
   ON UPDATE CASCADE ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
+-- ---------------------------------------------------------------------
+-- Table `tevent_comment`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tevent_comment` (
+  `id` serial PRIMARY KEY,
+  `id_event` BIGINT UNSIGNED NOT NULL,
+  `utimestamp` BIGINT NOT NULL DEFAULT 0,
+  `comment` TEXT,
+  `id_user` VARCHAR(255) DEFAULT NULL,
+  `action` TEXT,
+  FOREIGN KEY (`id_event`) REFERENCES `tevento`(`id_evento`)
+    ON UPDATE CASCADE ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+  
 -- ---------------------------------------------------------------------
 -- Table `tgrupo`
 -- ---------------------------------------------------------------------
@@ -831,6 +844,17 @@ CREATE TABLE IF NOT EXISTS `tmodule_group` (
   PRIMARY KEY  (`id_mg`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps` (
+  `id_app` int(10) auto_increment,
+  `short_name` varchar(250) NOT NULL DEFAULT '',
+  `name` varchar(250) NOT NULL DEFAULT '',
+  `section` varchar(250) NOT NULL DEFAULT 'custom',
+  `description` varchar(250) NOT NULL DEFAULT '',
+  `version` varchar(250) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id_app`),
+  UNIQUE (`short_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
 -- This table was moved cause the `tmodule_relationship` will add
 -- a foreign key for the trecon_task(id_rt)
 -- ----------------------------------------------------------------------
@@ -881,8 +905,12 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
   `type` INT NOT NULL DEFAULT 0,
   `subnet_csv` TINYINT UNSIGNED DEFAULT 0,
   `snmp_skip_non_enabled_ifs` TINYINT UNSIGNED DEFAULT 1,
+  `id_app` int(10),
+  `setup_complete` tinyint unsigned NOT NULL DEFAULT 0,
+  `executions_timeout` int unsigned NOT NULL DEFAULT 60,
   PRIMARY KEY  (`id_rt`),
-  KEY `recon_task_daemon` (`id_recon_server`)
+  KEY `recon_task_daemon` (`id_recon_server`),
+  FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB  DEFAULT CHARSET=UTF8MB4;
 
 -- ----------------------------------------------------------------------
@@ -3749,20 +3777,6 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields_filter` (
   PRIMARY KEY(`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
--- -----------------------------------------------------
--- Table `tnetwork_matrix`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `tnetwork_matrix` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `source` VARCHAR(60) DEFAULT '',
-  `destination` VARCHAR(60) DEFAULT '',
-  `utimestamp` BIGINT DEFAULT 0,
-  `bytes` INT UNSIGNED DEFAULT 0,
-  `pkts` INT UNSIGNED DEFAULT 0,
-  PRIMARY KEY (`id`),
-  UNIQUE (`source`, `destination`, `utimestamp`)
-) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 ;
-
 -- ---------------------------------------------------------------------
 -- Table `user_task`
 -- ---------------------------------------------------------------------
@@ -4330,6 +4344,44 @@ CREATE TABLE IF NOT EXISTS `tsesion_filter_log_viewer` (
   PRIMARY KEY (`id_filter`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
+-- ---------------------------------------------------------------------
+-- Table `tdiscovery_apps_scripts`
+-- ---------------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps_scripts` (
+  `id_app` int(10),
+  `macro` varchar(250) NOT NULL DEFAULT '',
+  `value` text NOT NULL DEFAULT '',
+  PRIMARY KEY (`id_app`, `macro`),
+  FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+-- ---------------------------------------------------------------------
+-- Table `tdiscovery_apps_executions`
+-- ---------------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps_executions` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `id_app` int(10),
+  `execution` text NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`, `id_app`),
+  FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+-- ---------------------------------------------------------------------
+-- Table `tdiscovery_apps_tasks_macros`
+-- ---------------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `tdiscovery_apps_tasks_macros` (
+  `id_task` int(10) unsigned NOT NULL,
+  `macro` varchar(250) NOT NULL DEFAULT '',
+  `type` varchar(250) NOT NULL DEFAULT 'custom',
+  `value` text NOT NULL DEFAULT '',
+  `temp_conf` tinyint unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id_task`, `macro`),
+  FOREIGN KEY (`id_task`) REFERENCES trecon_task(`id_rt`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
 -- ---------------------------------------------------------------------
 -- Table `tnetwork_explorer_filter`
 -- ---------------------------------------------------------------------
@@ -4352,4 +4404,4 @@ CREATE TABLE IF NOT EXISTS `tnetwork_explorer_filter` (
   `action` VARCHAR(45) NULL,
   `advanced_filter` TEXT NULL,
   PRIMARY KEY (`id`)
-  ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
\ No newline at end of file
+  ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
diff --git a/pandora_console/vendor/artica/phpchartjs/composer.json b/pandora_console/vendor/artica/phpchartjs/composer.json
index 81cd50ecf5..39d63f4fd4 100644
--- a/pandora_console/vendor/artica/phpchartjs/composer.json
+++ b/pandora_console/vendor/artica/phpchartjs/composer.json
@@ -7,7 +7,7 @@
     "php"
   ],
   "readme": "README.md",
-  "homepage": "https://artica.es/",
+  "homepage": "https://pandorafms.com/",
   "type": "package",
   "version": "v1.0.2",
   "license": "AGPL-3.0-or-later",
diff --git a/pandora_console/vendor/composer/installed.json b/pandora_console/vendor/composer/installed.json
index 1022a9f68b..3679134135 100644
--- a/pandora_console/vendor/composer/installed.json
+++ b/pandora_console/vendor/composer/installed.json
@@ -629,7 +629,7 @@
                 }
             ],
             "description": "PHP library for ChartJS",
-            "homepage": "https://artica.es/",
+            "homepage": "https://pandorafms.com/",
             "keywords": [
                 "chartjs",
                 "graph",
diff --git a/pandora_console/views/calendar/list.php b/pandora_console/views/calendar/list.php
index 236f20460e..2a7c0721c9 100644
--- a/pandora_console/views/calendar/list.php
+++ b/pandora_console/views/calendar/list.php
@@ -105,7 +105,7 @@ try {
         [
             'id'                  => $tableId,
             'class'               => 'info_table',
-            'style'               => 'width: 99%',
+            'style'               => 'width: 100%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'ajax_url'            => $ajax_url,
diff --git a/pandora_console/views/cluster/list.php b/pandora_console/views/cluster/list.php
index f9afe627c1..39c00efd91 100644
--- a/pandora_console/views/cluster/list.php
+++ b/pandora_console/views/cluster/list.php
@@ -82,7 +82,7 @@ try {
         [
             'id'                  => $tableId,
             'class'               => 'info_table',
-            'style'               => 'width: 99%',
+            'style'               => 'width: 100%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'ajax_url'            => $model->ajaxController,
diff --git a/pandora_console/views/consoles/list.php b/pandora_console/views/consoles/list.php
index 14131f4357..a35f0818cf 100644
--- a/pandora_console/views/consoles/list.php
+++ b/pandora_console/views/consoles/list.php
@@ -86,7 +86,7 @@ try {
         [
             'id'                  => $tableId,
             'class'               => 'info_table',
-            'style'               => 'width: 99%',
+            'style'               => 'width: 100%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'ajax_url'            => 'include/ajax/consoles.ajax',
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index c701f89d7a..cc9c9f79ce 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,10 +1,10 @@
 package: pandorafms-server
-Version: 7.0NG.772-230720
+Version: 7.0NG.772-230731
 Architecture: all
 Priority: optional
 Section: admin
 Installed-Size: 640
-Maintainer: ÁRTICA ST <info@artica.es>
+Maintainer: Pandora FMS <info@pandorafms.com>
 Homepage: http://pandorafms.org/
 Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, libio-socket-ssl-perl, snmp-mibs-downloader, libjson-perl, libnet-telnet-perl, libencode-locale-perl, libgeo-ip-perl
 Description: Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments. This is the server package. Server makes the remote checks and process information transfer by Pandora FMS agents to the server.
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 8448820ea5..4bc84d987a 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.772-230720"
+pandora_version="7.0NG.772-230731"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/Makefile.PL b/pandora_server/Makefile.PL
index ac1c613f3b..107bd69c3f 100644
--- a/pandora_server/Makefile.PL
+++ b/pandora_server/Makefile.PL
@@ -17,7 +17,7 @@ WriteMakefile(
 
 	NAME            => 'PandoraFMS',
 	VERSION_FROM    => 'lib/PandoraFMS/Config.pm',
-	AUTHOR 			=> 'Artica ST <info@artica.es>',
+	AUTHOR 			=> 'Pandora FMS <info@pandorafms.com>',
 	PREREQ_PM 	=> {
 		NetAddr::IP => 0,
 		DBI => 0,
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d1f680bfa8..4e045bcbc2 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.772";
-my $pandora_build = "230720";
+my $pandora_build = "230731";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -1535,7 +1535,7 @@ sub pandora_get_initial_product_name {
 sub pandora_get_initial_copyright_notice {
 	# PandoraFMS product name
 	my $name = $ENV{'PANDORA_RB_COPYRIGHT_NOTICE'};
-	return 'Artica ST' unless (defined ($name) && $name ne '');
+	return 'Pandora FMS' unless (defined ($name) && $name ne '');
 	return $name;
 }
 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index d287f880c8..b90044db58 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -4098,17 +4098,12 @@ sub pandora_event {
 	$module_status = defined($module) ? $module->{'estado'} : 0 unless defined ($module_status);
 	
 	# If the event is created with validated status, assign ack_utimestamp
-	my $ack_utimestamp = $event_status == 1 ? time() : 0;
+	my $ack_utimestamp = ($event_status == 1 || $event_status == 2) ? time() : 0;
 	
 	my $utimestamp = time ();
 	my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime ($utimestamp));
 	$id_agentmodule = 0 unless defined ($id_agentmodule);
 	
-	if($comment ne '') {
-		my @comment_data = ({ comment => $comment, action => "Added comment", id_user => $user_name, utimestamp => $utimestamp});
-		$comment = encode_json \@comment_data;
-	}
-	
 	# Validate events with the same event id
 	if (defined ($id_extra) && $id_extra ne '') {
 		my $keep_in_process_status_extra_id = pandora_get_tconfig_token ($dbh, 'keep_in_process_status_extra_id', 0);
@@ -4122,6 +4117,7 @@ sub pandora_event {
 			# Only when the event comes as New. Validated events are excluded
 			if (defined($id_extra_inprocess_count) && $id_extra_inprocess_count > 0 && $event_status == 0) {
 				logger($pa_config, "Keeping In process status from last event with extended id '$id_extra'.", 10);
+				$ack_utimestamp = get_db_value ($dbh, 'SELECT ack_utimestamp FROM tevento WHERE id_extra=? AND estado=2', $id_extra);
 				$event_status = 2;
 			}
 		}
@@ -4134,8 +4130,13 @@ sub pandora_event {
 
 	# Create the event
 	logger($pa_config, "Generating event '$evento' for agent ID $id_agente module ID $id_agentmodule.", 10);
-	$event_id = db_insert ($dbh, 'id_evento','INSERT INTO tevento (id_agente, id_grupo, evento, timestamp, estado, utimestamp, event_type, id_agentmodule, id_alert_am, criticity, user_comment, tags, source, id_extra, id_usuario, critical_instructions, warning_instructions, unknown_instructions, ack_utimestamp, custom_data, data, module_status)
-	              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id_agente, $id_grupo, safe_input ($evento), $timestamp, $event_status, $utimestamp, $event_type, $id_agentmodule, $id_alert_am, $severity, $comment, $module_tags, $source, $id_extra, $user_name, $critical_instructions, $warning_instructions, $unknown_instructions, $ack_utimestamp, $custom_data, safe_input($module_data), $module_status);
+	$event_id = db_insert ($dbh, 'id_evento','INSERT INTO tevento (id_agente, id_grupo, evento, timestamp, estado, utimestamp, event_type, id_agentmodule, id_alert_am, criticity, tags, source, id_extra, id_usuario, critical_instructions, warning_instructions, unknown_instructions, ack_utimestamp, custom_data, data, module_status)
+	              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id_agente, $id_grupo, safe_input ($evento), $timestamp, $event_status, $utimestamp, $event_type, $id_agentmodule, $id_alert_am, $severity, $module_tags, $source, $id_extra, $user_name, $critical_instructions, $warning_instructions, $unknown_instructions, $ack_utimestamp, $custom_data, safe_input($module_data), $module_status);
+
+	if(defined($event_id) && $comment ne '') {
+		my $comment_id = db_insert ($dbh, 'id','INSERT INTO tevent_comment (id_event, utimestamp, comment, id_user, action)
+											VALUES (?, ?, ?, ?, ?)', $event_id, $utimestamp, safe_input($comment), $user_name, "Added comment");
+	}
 
 	# Do not write to the event file
 	return $event_id if ($pa_config->{'event_file'} eq '');
@@ -4143,7 +4144,7 @@ sub pandora_event {
 	# Add a header when the event file is created
 	my $header = undef;
 	if (! -f $pa_config->{'event_file'}) {
-		$header = "agent_name,group_name,evento,timestamp,estado,utimestamp,event_type,module_name,alert_name,criticity,user_comment,tags,source,id_extra,id_usuario,critical_instructions,warning_instructions,unknown_instructions,ack_utimestamp";
+		$header = "agent_name,group_name,evento,timestamp,estado,utimestamp,event_type,module_name,alert_name,criticity,tags,source,id_extra,id_usuario,critical_instructions,warning_instructions,unknown_instructions,ack_utimestamp";
 	}
 	
 	# Open the event file for writing
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index 7ed8d9e2f8..a5a6d98b80 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -62,6 +62,7 @@ our @EXPORT = qw(
 		set_update_agent
 		set_update_agentmodule
 		get_action_id
+		get_action_name
 		get_addr_id
 		get_agent_addr_id
 		get_agent_id
@@ -102,6 +103,8 @@ our @EXPORT = qw(
 		get_server_id
 		get_tag_id
 		get_tag_name
+		get_template_id
+		get_template_name
 		get_group_name
 		get_template_id
 		get_template_module_id
@@ -257,15 +260,28 @@ sub get_console_api_url ($$) {
 }
 
 ########################################################################
-## Return action ID given the action name.
+## Return the ID of an alert action given its name.
 ########################################################################
 sub get_action_id ($$) {
 	my ($dbh, $action_name) = @_;
 
-	my $rc = get_db_value ($dbh, "SELECT id FROM talert_actions WHERE name = ?", $action_name);
+	my $rc = get_db_value ($dbh, "SELECT id FROM talert_actions
+	                       WHERE name = ?", safe_input($action_name));
 	return defined ($rc) ? $rc : -1;
 }
 
+########################################################################
+## Return the name of an alert action given its ID.
+########################################################################
+sub get_action_name ($$) {
+	my ($dbh, $action_id) = @_;
+
+	my $rc = get_db_value ($dbh, "SELECT name FROM talert_actions
+	                       WHERE id = ?", safe_input($action_id));
+	return defined ($rc) ? $rc : -1;
+}
+
+
 ########################################################################
 ## Return command ID given the command name.
 ########################################################################
@@ -304,6 +320,29 @@ sub get_agent_ids_from_alias ($$) {
 	return @rc;
 }
 
+########################################################################
+## Return the ID of an alert template given its name.
+########################################################################
+sub get_template_id ($$) {
+	my ($dbh, $template_name) = @_;
+
+	my $rc = get_db_value ($dbh, "SELECT id FROM talert_templates
+	                       WHERE name = ?", safe_input($template_name));
+	return defined ($rc) ? $rc : -1;
+}
+
+########################################################################
+## Return the name of an alert template given its ID.
+########################################################################
+sub get_template_name ($$) {
+	my ($dbh, $template_id) = @_;
+
+	my $rc = get_db_value ($dbh, "SELECT name FROM talert_templates
+	                       WHERE id = ?", safe_input($template_id));
+	return defined ($rc) ? $rc : -1;
+}
+
+
 ########################################################################
 ## Return server ID given the name of server.
 ########################################################################
@@ -698,24 +737,6 @@ sub get_agent_module_id ($$$) {
 	return defined ($rc) ? $rc : -1;
 }
 
-##########################################################################
-## Return template id given the template name.
-##########################################################################
-sub get_template_id ($$) {
-	my ($dbh, $template_name) = @_;
-	
-	my $field;
-	if ($RDBMS eq 'oracle') {
-		$field = "to_char(name)";
-	}
-	else {
-		$field = "name";
-	}
-	
-	my $rc = get_db_value ($dbh, "SELECT id FROM talert_templates WHERE $field = ?", safe_input($template_name));
-	return defined ($rc) ? $rc : -1;
-}
-
 ##########################################################################
 ## Return the module template id given the module id and the template id.
 ##########################################################################
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index e003653b02..896bbf935f 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -313,8 +313,6 @@ sub data_consumer ($$) {
 				enterprise_hook('process_xml_connections', [$self->getConfig (), $file_name, $xml_data, $self->getDBH ()]);
 			} elsif (defined($xml_data->{'ipam_source'})) {
 				enterprise_hook('process_xml_ipam', [$self->getConfig (), $file_name, $xml_data, $self->getDBH ()]);
-			} elsif (defined($xml_data->{'network_matrix'})){
-				process_xml_matrix_network( $self->getConfig(), $xml_data, $self->getDBH());
 			} else {
 				process_xml_data ($self->getConfig (), $file_name, $xml_data, $self->getServerID (), $self->getDBH ());
 			}
@@ -1130,45 +1128,6 @@ sub process_events_dataserver {
 	return;
 }
 
-
-##########################################################################
-# Process events in the XML.
-##########################################################################
-sub process_xml_matrix_network {
-	my ($pa_config, $data, $dbh)  = @_;
-
-	my $utimestamp = $data->{'network_matrix'}->[0]->{'utimestamp'};
-	my $content = $data->{'network_matrix'}->[0]->{'content'};
-	return unless defined($utimestamp) && defined($content);
-
-	# Try to decode the base64 inside
-	my $matrix_info;
-	eval {
-		$matrix_info = decode_json(decode_base64($content));
-	};
-
-	if ($@) {
-		logger($pa_config, "Error processing base64 matrix data '$content'.", 5);
-		return;
-	}
-	foreach my $source (keys %$matrix_info) {
-		foreach my $destination (keys %{$matrix_info->{$source}}) {
-			my $matrix_single_data = $matrix_info->{$source}->{$destination};
-			$matrix_single_data->{'source'} = $source;
-			$matrix_single_data->{'destination'} = $destination;
-			$matrix_single_data->{'utimestamp'} = $utimestamp;
-			eval {
-				db_process_insert($dbh, 'id', 'tnetwork_matrix', $matrix_single_data);
-			};
-			if ($@) {
-				logger($pa_config, "Error inserted matrix data. Source: $source, destination: $destination, utimestamp: $utimestamp.", 5);
-			}
-		}
-	}
-
-	return;
-}
-
 ##########################################################################
 # Get a lock on the given agent. Return 1 on success, 0 otherwise.
 ##########################################################################
diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
index bce36263d3..d331c7986d 100644
--- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
+++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
@@ -68,6 +68,7 @@ use constant {
   DISCOVERY_REVIEW => 0,
   DISCOVERY_STANDARD => 1,
   DISCOVERY_RESULTS => 2,
+  DISCOVERY_APP => 15,
 };
 
 ################################################################################
@@ -147,17 +148,23 @@ sub data_producer ($) {
       WHERE id_recon_server = ?
       AND disabled = 0
       AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1)
-        OR (status = -1 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP()))', $server_id);
+        OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP()))', $server_id);
   } else {
     @rows = get_db_rows ($dbh, 'SELECT * FROM trecon_task 
       WHERE (id_recon_server = ? OR id_recon_server NOT IN (SELECT id_server FROM tserver WHERE status = 1 AND server_type = ?))
       AND disabled = 0
       AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1)
-        OR (status = -1 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP()))', $server_id, DISCOVERYSERVER);
+        OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP()))', $server_id, DISCOVERYSERVER);
   }
 
   foreach my $row (@rows) {
     
+	# Discovery apps must be fully set up.
+    if ($row->{'type'} == DISCOVERY_APP && $row->{'setup_complete'} != 1) {
+      logger($pa_config, 'Setup for recon app task ' . $row->{'id_app'} . ' not complete.', 10);
+	  next;
+    }
+
     # Update task status
     update_recon_task ($dbh, $row->{'id_rt'}, 1);
     
@@ -185,7 +192,13 @@ sub data_consumer ($$) {
   if (defined ($task->{'id_recon_script'}) && ($task->{'id_recon_script'} != 0)) {
     exec_recon_script ($pa_config, $dbh, $task);
     return;
-  } else {
+  }
+  # Is it a discovery app?
+  elsif ($task->{'type'} == DISCOVERY_APP) {
+    exec_recon_app ($pa_config, $dbh, $task);
+	return;
+  }
+  else {
     logger($pa_config, 'Starting recon task for net ' . $task->{'subnet'} . '.', 10);
   }
 
@@ -407,7 +420,373 @@ sub exec_recon_script ($$$) {
 }
 
 ################################################################################
-# Guess the OS using nmap.
+# Executes recon apps.
+################################################################################
+sub exec_recon_app ($$$) {
+	my ($pa_config, $dbh, $task) = @_;
+	
+	# Get execution, macro and script data.
+	my @executions = get_db_rows($dbh, 'SELECT * FROM tdiscovery_apps_executions WHERE id_app = ?', $task->{'id_app'});
+	my @scripts = get_db_rows($dbh, 'SELECT * FROM tdiscovery_apps_scripts WHERE id_app = ?', $task->{'id_app'});
+	
+	logger($pa_config, 'Executing recon app ID ' . $task->{'id_app'}, 10);
+	
+	# Configure macros.
+	my %macros = (
+		"__taskMD5__"        => md5($task->{'id_rt'}),
+		"__taskInterval__"   => $task->{'interval_sweep'},
+		"__taskGroup__"      => get_group_name($dbh, $task->{'id_group'}),
+		"__taskGroupID__"    => $task->{'id_group'},
+		"__temp__"           => $pa_config->{'temporal'},
+		"__incomingDir__"    => $pa_config->{'incomingdir'},
+		"__consoleAPIURL__"  => $pa_config->{'console_api_url'},
+		"__consoleAPIPass__" => $pa_config->{'console_api_pass'},
+		"__consoleUser__"    => $pa_config->{'console_user'},
+		"__consolePass__"    => $pa_config->{'console_pass'},
+		get_recon_app_macros($pa_config, $dbh, $task),
+		get_recon_script_macros($pa_config, $dbh, $task)
+	);
+
+	# Dump macros to disk.
+	dump_recon_app_macros($pa_config, $dbh, $task, \%macros);
+
+	# Run executions.
+	my $status = -1;
+	my @summary;
+	for (my $i = 0; $i < scalar(@executions); $i++) {
+		my $execution = $executions[$i];
+
+		# NOTE: Add the redirection before calling subst_alert_macros to prevent it from escaping quotes.
+		my $cmd = $pa_config->{'plugin_exec'} . ' ' . $task->{'executions_timeout'} . ' ' .
+				  subst_alert_macros(safe_output($execution->{'execution'}) . ' 2>&1', \%macros);
+		logger($pa_config, 'Executing command for recon app ID ' . $task->{'id_app'} . ': ' . $cmd, 10);
+		my $output_json = `$cmd`;
+
+		# Something went wrong.
+		my $rc = $? >> 8;
+		if ($rc != 0) {
+			$status = -2;
+		}
+
+		# Timeout specific mesage.
+		if ($rc == 124) {
+			push(@summary, "The execution timed out.");
+			next;
+		}
+
+		# No output message.
+		if (!defined($output_json)) {
+			push(@summary, "The execution returned no output.");
+			next;
+		}
+
+		# Parse the output.
+		my $output = eval {
+			local $SIG{'__DIE__'};
+			decode_json($output_json);
+		};
+
+		# Non-JSON output.
+		if (!defined($output)) {
+			push(@summary, $output_json);
+			next;
+		}
+
+		# Process monitoring data.
+		if (defined($output->{'monitoring_data'})) {
+	    	my $recon = new PandoraFMS::Recon::Base(
+				dbh => $dbh,
+				group_id => $task->{'id_group'},
+				id_os => $task->{'id_os'},
+				pa_config => $pa_config,
+				snmp_enabled => 0,
+				task_id => $task->{'id_rt'},
+				task_data => $task,
+			);
+			$recon->create_agents($output->{'monitoring_data'});
+			delete($output->{'monitoring_data'});
+		}
+
+		# Store output data.
+		push(@summary, $output);
+
+		# Update the progress.
+		update_recon_task($dbh, $task->{'id_rt'}, int((100 * ($i + 1)) / scalar(@executions)));
+	}
+
+	# Parse the output.
+	my $summary_json = eval {
+		local $SIG{'__DIE__'};
+		encode_json(\@summary);
+	};
+	if (!defined($summary_json)) {
+		logger($pa_config, 'Invalid summary for recon app ID ' . $task->{'id_app'}, 10);
+	} else {
+		db_do($dbh, "UPDATE trecon_task SET summary=? WHERE id_rt=?", $summary_json, $task->{'id_rt'});
+	}
+
+	update_recon_task($dbh, $task->{'id_rt'}, $status);
+	
+	return;
+}
+
+################################################################################
+# Processe app macros and return them ready to be used by subst_alert_macros.
+################################################################################
+sub get_recon_app_macros ($$$) {
+	my ($pa_config, $dbh, $task) = @_;
+	my %macros;
+	
+	# Get a list of macros for the given task.
+	my @macro_array = get_db_rows($dbh, 'SELECT * FROM tdiscovery_apps_tasks_macros WHERE id_task = ?', $task->{'id_rt'});
+	foreach my $macro_item (@macro_array) {
+		my $macro_id = safe_output($macro_item->{'id_task'});
+		my $macro_name = safe_output($macro_item->{'macro'});
+		my $macro_type = $macro_item->{'type'};
+		my $macro_value = safe_output($macro_item->{'value'});
+		my $computed_value = '';
+	
+		# The value can be a JSON array of values.
+		my $value_array = eval {
+			local $SIG{'__DIE__'};
+			decode_json($macro_value);
+		};
+		if (defined($value_array) && ref($value_array) eq 'ARRAY') {
+			# Multi value macro.
+			my @tmp;
+			foreach my $value_item (@{$value_array}) {
+				push(@tmp, get_recon_macro_value($pa_config, $dbh, $macro_type, $value_item));
+			}
+			$computed_value = p_encode_json($pa_config, \@tmp);
+			if (!defined($computed_value)) {
+				logger($pa_config, "Error encoding macro $macro_name for task ID " . $task->{'id_rt'}, 10);
+				next;
+			}
+		} else {
+			# Single value macro.
+			$computed_value = get_recon_macro_value($pa_config, $dbh, $macro_type, $macro_value);
+		}
+
+		# Store the computed value.
+		$macros{$macro_name} = $computed_value;
+	}
+
+	return %macros;
+}
+
+################################################################################
+# Dump macros that must be saved to disk.
+# The macros dictionary is modified in-place.
+################################################################################
+sub dump_recon_app_macros ($$$$) {
+	my ($pa_config, $dbh, $task, $macros) = @_;
+
+	# Get a list of macros that must be dumped to disk.
+	my @macro_array = get_db_rows($dbh, 'SELECT * FROM tdiscovery_apps_tasks_macros WHERE id_task = ? AND temp_conf = 1', $task->{'id_rt'});
+	foreach my $macro_item (@macro_array) {
+		
+		# Make sure the macro has already been parsed.
+		my $macro_name = safe_output($macro_item->{'macro'});
+		next unless defined($macros->{$macro_name});
+		my $macro_value = $macros->{$macro_name};
+		my $macro_id = safe_output($macro_item->{'id_task'});
+
+		# Save the computed value to a temporary file.
+		my $temp_dir = $pa_config->{'incomingdir'} . '/discovery/tmp';
+		mkdir($temp_dir) if (! -d $temp_dir);
+		my $fname = $temp_dir . '/' . md5($task->{'id_rt'} . '_' . $macro_name) . '.macro';
+		eval {
+			open(my $fh, '>', $fname) or die($!);
+			print $fh subst_alert_macros($macro_value, $macros);
+			close($fh);
+		};
+		if ($@) {
+			logger($pa_config, "Error writing macro $macro_name for task ID " . $task->{'id_rt'} . " to disk: $@", 10);
+			next;
+		}
+	
+		# Set the macro value to the temporary file name.
+		$macros->{$macro_name} = $fname;
+	}
+}
+
+################################################################################
+# Processe recon script macros and return them ready to be used by
+# subst_alert_macros.
+################################################################################
+sub get_recon_script_macros ($$$) {
+	my ($pa_config, $dbh, $task) = @_;
+	my %macros;
+	
+	# Get a list of script macros.
+	my @macro_array = get_db_rows($dbh, 'SELECT * FROM tdiscovery_apps_scripts WHERE id_app = ?', $task->{'id_app'});
+	foreach my $macro_item (@macro_array) {
+		my $macro_name = safe_output($macro_item->{'macro'});
+		my $macro_value = safe_output($macro_item->{'value'});
+
+		# Compose the full path to the script: <incoming dir>/discovery/<app short name>/<script>
+		my $app = get_db_single_row($dbh, 'SELECT short_name FROM tdiscovery_apps WHERE id_app = ?', $task->{'id_app'});
+		if (!defined($app)) {
+			logger($pa_config, "Discovery app with ID " . $task->{'id_app'} . " not found.", 10);
+			next;
+		}
+
+		my $app_short_name = safe_output($app->{'short_name'});
+		$macros{$macro_name} = $pa_config->{'incomingdir'} . '/discovery/' . $app_short_name . '/' . $macro_value;
+	}
+
+	return %macros;
+}
+
+################################################################################
+# Return the replacement value for the given macro.
+################################################################################
+sub get_recon_macro_value($$$$) {
+	my ($pa_config, $dbh, $type, $value) = @_;
+	my $ret = '';
+
+	# These macros return the macro value itself.
+	if ($type eq 'custom' ||
+	    $type eq 'interval' ||
+		$type eq 'module_types' ||
+		$type eq 'status') {
+		$ret = $value;
+	}
+	# Name of the group if it exists. Empty otherwise.
+	elsif ($type eq 'agent_groups') {
+		my $group_name = get_group_name($dbh, $value);
+		if (defined($group_name)) {
+			$ret = $group_name;
+		}
+	}
+	# Name of the agent if it exists. Empty otherwise.
+	elsif ($type eq 'agents') {
+		my $agent_id = get_agent_id($dbh, $value);
+		if ($agent_id > 0) {
+			$ret = $value;
+		}
+	}
+	# Name of the module group if it exists. Empty otherwise.
+	elsif ($type eq 'module_groups') {
+		my $module_group_name = get_module_group_name($dbh, $value);
+		if (defined($module_group_name)) {
+			$ret = $module_group_name;
+		}
+	}
+	# Name of the module if it exists. Empty otherwise.
+	elsif ($type eq 'modules') {
+		my $module_id = get_db_value ($dbh, "SELECT id_agente_modulo FROM tagente_modulo WHERE nombre = ?", safe_input($value));
+		if ($module_id > 0) {
+			$ret = $value;
+		}
+	}
+	# Name of the tag if it exists. Empty otherwise.
+	elsif ($type eq 'tags') {
+		my $tag_name = get_tag_name($dbh, $value);
+		if (defined($tag_name)) {
+			$ret = $tag_name;
+		}
+	}
+	# Name of the alert template if it exists. Empty otherwise.
+	elsif ($type eq 'alert_templates') {
+		my $template_name = get_template_name($dbh, $value);
+		if (defined($template_name)) {
+			$ret = $template_name;
+		}
+	}
+	# Name of the alert action if it exists. Empty otherwise.
+	elsif ($type eq 'alert_actions') {
+		my $action_name = get_action_name($dbh, $value);
+		if (defined($action_name)) {
+			$ret = $action_name;
+		}
+	}
+	# Name of the OS if it exists. Empty otherwise.
+	elsif ($type eq 'os') {
+		my $os_name = get_os_name($dbh, $value);
+		if (defined($os_name)) {
+			$ret = $os_name;
+		}
+	}
+	# Credentials from the Pandora DB.
+	elsif ($type =~ m/^credentials\./) {
+		$ret = get_recon_credential_macro($pa_config, $dbh, $value);
+	}
+
+	return $ret;
+}
+
+################################################################################
+# Return the value for a credential macro.
+################################################################################
+sub get_recon_credential_macro($$$) {
+	my ($pa_config, $dbh, $credential_id) = @_;
+	my $cred_dict = {};
+	my $cred_json = undef;
+
+	# Retrieve the credentials.
+	my $cred = get_db_single_row($dbh, 'SELECT * FROM tcredential_store WHERE identifier = ?', $credential_id);
+	return '' unless defined($cred);
+
+	# Generate the appropriate output for each product.
+	my $product = uc($cred->{'product'});
+	if ($product eq 'CUSTOM') {
+		$cred_dict = {
+			'user'     => safe_output($cred->{'username'}),
+			'password' => safe_output($cred->{'password'})
+		};
+	}
+	elsif ($product eq 'AWS') {
+		$cred_dict = {
+			'access_key_id'     => safe_output($cred->{'username'}),
+			'secret_access_key' => safe_output($cred->{'password'})
+		};
+	}
+	elsif ($product eq 'AZURE') {
+		$cred_dict = {
+			'client_id'          => safe_output($cred->{'username'}),
+			'application_secret' => safe_output($cred->{'password'}),
+			'tenant_domain'      => safe_output($cred->{'extra_1'}),
+			'subscription_id'    => safe_output($cred->{'extra_2'})
+		};
+	}
+	elsif ($product eq 'GOOGLE') {
+		$cred_json = safe_output($cred->{'extra_1'});
+	}
+	elsif ($product eq 'SAP') {
+		$cred_dict = {
+			'user'     => safe_output($cred->{'username'}),
+			'password' => safe_output($cred->{'password'})
+		};
+	}
+	elsif ($product eq 'SNMP') {
+		$cred_json = safe_output($cred->{'extra_1'});
+	}
+	elsif ($product eq 'WMI') {
+		$cred_dict = {
+			'user'      =>  safe_output($cred->{'username'}),
+			'password'  =>  safe_output($cred->{'password'}),
+			'namespace' => safe_output($cred->{'extra_1'})
+		};
+	}
+
+	# Encode to JSON if needed.
+	if (!defined($cred_json)) {
+		$cred_json = p_encode_json($pa_config, $cred_dict);
+		if (!defined($cred_json)) {
+			logger($pa_config, "Error encoding credential $credential_id to JSON.", 10);
+			return '';
+		}
+	}
+
+	# Return the base 64 encoding of the credential JSON.
+	return encode_base64($cred_json, '');
+}
+
+
+
+################################################################################
+# Guess the OS using xprobe2 or nmap.
 ################################################################################
 sub PandoraFMS::Recon::Base::guess_os($$;$) {
   my ($self, $device, $string_flag) = @_;
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4ba1d70105..083950ffb5 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.772";
-my $pandora_build = "230720";
+my $pandora_build = "230731";
 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 a77349551b..f7c4d9a701 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.772
-%define release     230720
+%define release     230731
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 659b1dfcd1..61da1897fc 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.772
-%define release     230720
+%define release     230731
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 84d3f238e1..455a383bdd 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.772"
-PI_BUILD="230720"
+PI_BUILD="230731"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/load/README.MD b/pandora_server/util/load/README.MD
new file mode 100644
index 0000000000..d042cb1503
--- /dev/null
+++ b/pandora_server/util/load/README.MD
@@ -0,0 +1,36 @@
+### Purpose of this toolkit
+
+This directory contains configuration files and small scripts to generate an environment with simulated data for testing purposes.
+
+### Generation of XML files to simulate agent load
+
+There is a tool that comes configured with Pandora FMS to generate test data (pandora_xml_stress) and that generates XML. It has different options and in this directory is provided a configuration file and all the dictionaries and additional files to generate data of 300 agents, with pseudo-random names (like for example "7fb8a1a734c24cc22a5c75eb").
+
+These agents are defined in the "pandora_xml_stress.agents" file. If you want less agents, you can delete elements in this file.
+
+To execute the XML generation manually from the code repository:
+
+ cd pandorafms/pandora_server/util/load
+ perl ../pandora_xml_stress.pl pandora_xml_stress.conf 
+
+This will generate 300 XML in the /var/spool/pandora/data_in directory.
+
+If you create a scheduled execution of this command every 5 minutes (e.g. through cron), keep in mind that if the PandoraFMS server stops, it could have hundreds of thousands of XML files pending to be processed.
+
+Create /etc/cron.d/pandora_stress with this content:
+
+  */5 * * * * root <putyourscripthere>
+
+
+### Generation of groups and users
+
+The script 'create_usersandgroups.sh' will take a list of names from the file 'usernames.txt' and through CLI will create those users in the local Pandora FMS.
+
+On the other hand, it will also create a series of groups, taking as source the names of the file 'groupnames.txt'. It will associate to each user a group of the existing ones with the profile "Operator (Read").
+
+Finally, it will take all the agents available in Pandora FMS and it will distribute them in an equal and random way among the available groups.
+
+You should only run it once:
+
+  cd pandorafms/pandora_server/util/load
+  ./create_userandgroups.sh
diff --git a/pandora_server/util/load/create_usersandgroups.sh b/pandora_server/util/load/create_usersandgroups.sh
new file mode 100644
index 0000000000..36534bbf0b
--- /dev/null
+++ b/pandora_server/util/load/create_usersandgroups.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# (c) 2023 Pandora FMS, by Sancho Lerena
+# This script is used to create a huge load of data
+# It creates a group from each item in groupnames.txt
+# It creates an user from each item in usernames.txt
+# It gives an association to each user for a random group using a Read Only operator profile
+# It moves each agent to a primary group, randomly from groupname.txt
+
+if [ ! -e usernames.txt ]
+then
+   echo "Error, I cannot find usernames.txt"
+   exit
+fi
+
+if [ ! -e groupnames.txt ]
+then
+   echo "Error, I cannot find groupnames.txt"
+   exit
+fi
+
+# Create users from usernames.txt
+for a in `cat usernames.txt`
+do
+    /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --create_user $a $a 0 "Created by CLI"
+done
+
+
+# Create groups from groupnames.txt
+for a in `cat groupnames.txt`
+do
+    /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --create_group  $a
+done
+
+# Associate a group to each user
+TOTAL_GROUPS=`cat groupnames.txt | wc -l`
+for username in `cat usernames.txt`
+do
+        RAN=`echo $RANDOM % $TOTAL_GROUPS + 1 | bc`
+    GROUP_NAME=`cat groupnames.txt | tail -$RAN | head -1`
+
+    /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --add_profile $username "Operator (Read)" $GROUP_NAME
+done
+
+# Move each agent to a random group
+TOTAL_GROUPS=`cat groupnames.txt | wc -l`
+for agentname in `/usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --get_agents | cut -f 2 -d ","`
+do
+        RAN=`echo $RANDOM % $TOTAL_GROUPS + 1 | bc`
+    GROUP_NAME=`cat groupnames.txt | tail -$RAN | head -1`
+    /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --update_agent $agentname group_name $GROUP_NAME
+done
diff --git a/pandora_server/util/load/groupnames.txt b/pandora_server/util/load/groupnames.txt
new file mode 100644
index 0000000000..86c1426a88
--- /dev/null
+++ b/pandora_server/util/load/groupnames.txt
@@ -0,0 +1,44 @@
+Ali
+Alisha
+Amado
+Angeline
+Arlen
+Arline
+Barbra
+Beth
+Bette
+Bradly
+Brenton
+Candace
+Candy
+Carroll
+Cecelia
+Chance
+Chang
+Chase
+Chasity
+Tracey
+Vincent
+Ward
+Wiley
+Willie
+Winnie
+zurc
+Grasstongue
+Khung
+Mudblood
+Grosk
+Grumblehammer
+Snun
+Emberfang
+Zotvind
+Stormfist
+Knigbrur
+Rockclaw
+Skalbrusk
+Rivergut
+Vitrurk
+Coldpelt
+Doddosk
+Fistbasher
+Skikkin
\ No newline at end of file
diff --git a/pandora_server/util/load/pandora_xml_stress.agents b/pandora_server/util/load/pandora_xml_stress.agents
new file mode 100644
index 0000000000..da718018e0
--- /dev/null
+++ b/pandora_server/util/load/pandora_xml_stress.agents
@@ -0,0 +1,300 @@
+bf78e4acf01eb3144b5f3cf5
+83c2b346af90edc2fa0de4e1
+602ef1ca527c0bb7d144bf0a
+4012470edc77bc97f58b3f80
+9daa3ecee84ed039bcf2efdc
+3dae00ce55f6985ac26a4402
+3a8ae8e8d417712166f6df48
+257f378d433124706d442bbb
+fa2025fd2f64462a43d94fae
+d17d6fd3720184cb5a7d199d
+4d9977b96f3b4e006e47112a
+6242411ed2d7f324b70c86d9
+92ed7a8b9e1e786172ca02e1
+50aca7828dabff6449740082
+e7c7487ef15715ee44cc7844
+0f0d005d0d9f31afcf979437
+51ced8d82e7e851d61b93670
+824a318186adb6603b4b804a
+387f85fe94caf0ebdfd15d63
+65833ad4e353ad573a14ef21
+3a276db7e3af8aa95872946f
+df6b8c060d9f385db4e53bd8
+8999734b6f54032df4465189
+bec95961964493dbca9cf544
+34957a75a1e362783e3de10f
+64ab08385a39067b8161cb68
+689544d5ec6199304feec7d1
+e926306ca1a952827d788828
+4ed79bf195c8287c443c86d2
+5094261d922982b388137a1f
+f90f364975c489b465092a04
+6fc797c7f3918310af9e9afa
+1c2be64167c08109c69e1130
+fea477977db6ac0d8021637f
+4939f84a23aff2a97b412ada
+385a5f99e3970b52f92c5b9e
+6176e5d648b335db3b79322e
+bf4d03212ee1eeeaa53cac26
+b7d0acbc714b76095a523286
+e3eb2fc6f548bbc8f7ac2f0c
+93c08fcfe26a5cc9be667bb7
+c6120aa7367523294dd8cb94
+07548491524ec76d96db5e26
+29bc64bd950f74b678d45e57
+8733dcfbb5d8832ee9319bc1
+16b9e5a78847d99ca636e90c
+4c9a17935849675164a7460b
+6c47aa0691ca8447bd7690d9
+b1ec5a21f332b3d3c5b7e35e
+3a0ff6da7e9c3ed12a8f9246
+ac823076dc634e47c51d3d67
+a0f7d6d23d0f6ad87889fdb2
+093c29ab1ff212ac9139b821
+6b5fc978a68a98e5c39d8e86
+334af374b4dee25929244b1e
+ffa507c102d330433ff15b9e
+89b03af9ca3428e7877fc6f2
+f10d7455b7386248e3b65acc
+07e37df13934913378ae9aa0
+6b261e22ae3882a928d7e0b5
+f96c558c07671ac8d52cec6c
+6be22d5bb4b2ba0751551ca1
+706fbe25372d5779225e2651
+eedc80256ab4d68cd477bcbe
+6e2e97c594245092c5f9fc3e
+3aa4e556f361196dc7c6102a
+091fd7bfa2b8b7bb81b20ea4
+9ad434c3e7796273d7d1d8b5
+9e8f16f56ff86d1161196430
+17a3b7ce50bcb52325126aeb
+edf98dbbeb2a5cf4d3baf70c
+8de575ca92807d1652a9fa73
+33faeb45a5a04e410056585d
+a8437131fa7d2ccfa015caf2
+7b478c40169b6bd1bd3fef83
+77a17435ca19143c7c18a490
+56bf42c56c42fb5334da25af
+f646df9f903178fcffada9b8
+a390ec6c1d641f44a5b76d9a
+deed99c701a0f4f2eaa551a4
+15197674acb20c324923d247
+e2517b8b94207380fa110334
+d62a50e795be6bd07c1f44c9
+0fd5b2606cb0e7a25e8a1370
+4f57d5b32737f75aff5fe8ed
+ebcfdb50f0f1a6d3c0c059dc
+dab99715dfe459bb357335c0
+aac40b9a6c4a9984adb09b14
+18f06ba95abb048598e865ab
+0eff987eb95e5a438c4c8018
+fb5c6d027180ab974b0b7675
+a8e2cdea5a3df0c42f11fc24
+3ffa5c21a78d67d7ae358099
+16f9280e03f99e432db79b84
+a8e28177ffb5aeda7f474fdf
+134ed984989a755e3dae8233
+70d364db21c5e85073e5b17e
+ce2196095062f09ae9569c54
+6965e3eb85c3431e22a3d199
+f76187d491c04c130cfa96d2
+3af29cc38e85351595f2a513
+d4dfbc5f347ff7985e8eb232
+add60e5dff9a33115b996a70
+8519bf76f1c1cb8da26e270d
+cb117a019377c03839dbb667
+c56e9ea3c4d373cdc301b423
+4f6afb90cbeeaf09756f7283
+a80172931917bcb8647edc96
+4a6f07d5d075bef6bf794db1
+5a0bbd407c6e224084987e88
+a325a700c253294582cf2546
+28197bd3d8c6ff0747deaf3d
+23719c710abf2d43dc0061b8
+19640261e5cde16ee8484f20
+247a72fa19ac7e52955b1ac6
+882cf1711c2c463eb4389b9a
+b9434493637d85cd4ae05ce6
+eafb645f5aae3b3d45eac64c
+4944420fba4c2ed3a5eebda9
+fa9f5d02a4e6e0a9c09b1a05
+3411890bc1237a086f5d4532
+f50c455cbd5fb84566f3c3d1
+b1b9783f6345b4732dc35887
+722d8ba0f5ebc313c98a8c82
+be2a4afbab53363815416730
+4440b997bd12750c15baac3c
+72ae565db9ea0b4686eacf6b
+88e70d097307fe10d46d922a
+5fcdfcd43be6e235ee8ae140
+8ba16c7ec192e2d93d3826db
+79d1c21a40baa3bae9d38c60
+28f4a1897afbc8db42ddb3bd
+b96aebdee9a0aa681c41f951
+28e63e948e80ef9351de678c
+c0d69c65c6544abb90b0be4e
+212d9e6df8d1cf8aa7e51979
+abf8c4265b09990aeddc0101
+c0cf6680054f443d0eb50a26
+2ce89791ce40e902ae9f3507
+4ce8e01633c1affb78fc238e
+b4f152dc64a3daa63fd0055f
+a56c545d8c4817fc6836fc96
+e4e91209ac4a94f6f9e5eed2
+31f7373460d648f208b677a4
+20fe6b8dbaedc3e1f7c86908
+be67e5298c830c0bb582556f
+63f5d1404aea4377779edf35
+b03831cce718125cb9612c07
+5465b26fd45d86b059066cc2
+5351de84d2fd638b138ba27b
+6c63000157aed37fa8c0c022
+8d3c18c7fbe518694c6bdb22
+615ec092b6f63bb14a2bb42e
+61de25cf8e12926c28aeffdc
+2b96bc1c8f6f81a5437b61bf
+ba1f4fcf3954e0efe5d68c83
+ee5bd3e1a937b90562677f1d
+0cf18ae18b0c680d00cb4d2e
+abf72b0d66f90bd6e67c43c6
+f263d033bb07e0b8cd405224
+418ddf02720649b40db2dd67
+01d1a735aa980326d385ea65
+0cc3860bb0a3fd5822b25ea4
+b0b89dbebfab05fafd6cf9dd
+2fcbb999444db5c0c77c2ec2
+f49a97b3531b8ab8d487c7a7
+ffb66d5003620e2fa47ef8ea
+04da742ab6c99b5c44f9f0cc
+dc310a9d42d7c367671ffbf9
+b0f5c4ee8d327449ef2103e6
+5bd2ce604ed7c820169f0ac2
+57f874a6e41baa5a1196b15f
+b43142736205ad1011f4a5a6
+50cf8523e5090251516eecb0
+ebad61d47be209696f9d41aa
+66bc5976a98266560d1867ff
+3c37fc452e9ad36cd7adcb1a
+4ac8c3db63a69ce883f3fcf5
+6c89e2bb90b9ab95f4adde3c
+917de5ece0a5ef663a8f44e7
+b50eba76cf29aca3cf696d7e
+74264c913ac1e141db78708a
+2b6c93011f62cffb5c085886
+700617c377952010272b9522
+dac10c8ddf7c45e55d8028af
+053328a6ff4f2773eebe76fe
+2d7390260285c272688ae1e8
+fa30c9ee6fb1e2f00d7ccb77
+0ca6db378a05246f30c8b820
+9ad6f959de166cc1475040ea
+23b4702f4dfb350085e77482
+4198a8ab80780c5d9b0d82d5
+baebd530dfc47ac77ea42d2a
+636d2ab4e018b5542e429f5e
+40ae44193af360eea68b6f0b
+dd47b39e494a62a4f5b6bef8
+240339c9dcd159595c1edbf3
+0f11840efe364ca6bbb17f43
+8522e203fb4b53e2bd6d6f82
+f134d9b501fa40b17993beee
+d0483306f2f972aacfb4fcea
+926ee4e0a80455cfee517f8b
+c188a327bc66df4878cb3e8b
+c874083c1d932bb4ade6d028
+be2271d8da327f97e05c1c60
+9ca7451d3f261682ec717547
+9eb46e2a5fd072c5267d7432
+41e8f3f7733f87e16b773bad
+f642220cd19f84154e4dd972
+fe3d9f6433883332b464b7ca
+3e9648ccf60b1fa712ea8590
+b7da7292e9418889bc957bd7
+fb4a392d386eca19eec9215e
+34188e4a6590877b2dbb67b0
+e233cb364659dea13dee1fd8
+757b8330465df34879414b7d
+5e0f80102fee69d0742934b2
+d72124afc78e9b3f91550497
+21c77bfe67c6e99f73323f42
+afa8ce345db6300882858f93
+886cc8b32ed80f4c69edb990
+64ea275ce73ef4070cefca19
+c676f1ffe5bdce4e1d3643ed
+baca61ab59568605e3ec8899
+1610892c53a071ed02d20c75
+3321fb7111d74e532932d262
+29583747ac9fbf0bf21c1574
+f51210b47a6e847dcfb52f94
+63c95735ba96c65d2d45b23d
+679c4e3acb15ebec6ecc7529
+42da0760b02d50c6587a8c31
+e42de775dcfcc3c950c1cff5
+ae5791cf265badebd39c78d9
+f66c123309525eeb81b47e92
+7cddc2b9ed6b4df83c72fcbe
+e69cc74632fdaa06f76f708a
+7cfd19c2eeaef2c0537332be
+d27cdcea69f4e49fbae06f4d
+bdfaa2ec52319f0e6533e826
+d59452cdfce11e21682a791f
+cbb74f2d35d54557abdbc2da
+369a4e6f128475bc9f87ef42
+90bf992a98d0b768cbc50520
+1fea663421dae7b418b9b15f
+f9fc5505565c43cebc1545f9
+d02a8f77fbb2b7f384a99949
+279ff35e17c7f6b6a043fde7
+9cf7725d3a97d9aa9e529ce6
+1f465b328b349502c0953b2d
+283fad60fa48ea2075a0e516
+ef5d9e841a02665c54d8fa7f
+b6023425cb4a1503726b3135
+7fb8a1a734c24cc22a5c75eb
+da38d78e83c9288e4cd60cca
+2a928a6498ae8e0b29675c25
+d2194ab5b0e48c2c1f213860
+53acafcd86a61ce55688ebef
+65608eeebc7d9fe2912635ed
+fafb0273e3b04deb1edb2628
+baf07d1f28416da065b6771f
+c2ee8e58209102fdd0bb341c
+f8e92e00670f65c29c4617c9
+a83661705134029ae344176d
+fc02c24e172d12a29b17eede
+2632f143ffe3f64e63e4ba32
+847120de4b72f59263d160f1
+5be36ff5b668eb93823974b2
+cdd8fe5081225519b5fc28af
+53569cbaedb9265839290a6c
+decca89ea0e8944fd93fcd24
+4b10511d840b7f5129ed6190
+5c4a1904de5f90f4d5dd749a
+49c47514c3308df82fcd6b79
+15af3e182c00000eea12f8e5
+a9645c4a43ad211d9ae9a406
+dcffa4e5eee8f966b1edcdaf
+75b25f796f1e392f45c3a737
+0ad5f0b96946ebcabd0457e9
+2f9128177cab74e0bad61189
+49ed14b81e0a166ccf335b4a
+dfe100788326c45dfb84579c
+2616f38caef9decae47e5023
+99b2d0eb14ac19d1cfedd86e
+fb1d4c42ea70fad330b5c5ee
+b6c560867faa3b41b1f5d4fa
+1167fb22e86098ef684eb702
+a2e2c2ee8ec87d4e5d59eb22
+b228beac094e16a0fa3cb528
+ea0de9aad68deed0a4df3e71
+e50cb420497d928ef9827800
+3bb39890ca4a6da941e01782
+73391f2914465c3f2335e24a
+f8b2f512cc0cbc024e2cd377
+4f816b0d36c934b44dbd5bc0
+817edf1e2637fef229752a5f
+4466f97959df7247f7410fbe
+cc85c727080e9d6eb75ef513
+7e27f012167ed8bedc4bd635
+98a445ff41a81a0a752aff25
+3b339e213dd613c4efd878c1
\ No newline at end of file
diff --git a/pandora_server/util/load/pandora_xml_stress.conf b/pandora_server/util/load/pandora_xml_stress.conf
new file mode 100644
index 0000000000..0dd2894e6a
--- /dev/null
+++ b/pandora_server/util/load/pandora_xml_stress.conf
@@ -0,0 +1,200 @@
+# Sample configuration file for pandora_xmlstress
+# (c) 2012, http://pandorafms.org
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Maximum number of threads, by default 5
+max_threads 4
+
+# File containing a list of agent names (one per line).
+agent_file pandora_xml_stress.agents
+
+# Directory where XML data files will be placed, by default /tmp.
+# When sending files to a local Tentacle server make sure this directory
+# and Pandora FMS Server's incomingdir are different.
+temporal /tmp
+
+# Pandora FMS XML Stress log file, logs to stdout by default.
+log_file pandora_xml_stress.log
+
+# XML version, by default 1.0.
+xml_version 1.0
+
+# XML encoding, by default UTF-8.
+encoding UTF-8
+
+# Operating system (shared by all agents), by default Linux.
+os_name Linux
+
+# Operating system version (shared by all agents), by default 2.6.
+os_version 2.6
+
+# Agent group, by default Servers.
+#group Servers
+
+# Agent interval, by default 300.
+agent_interval 300
+
+# Data file generation start date, by default now.
+#time_from 2023-03-01 00:00:00
+
+# Data file generation end date, by default now.
+#time_to 2023-03-02 00:00:00
+
+# Get conf from Pandora Server
+get_and_send_agent_conf 0
+
+# The directory to store the files conf agent (not in the server).
+# directory_confs .
+
+# The directory to generate the next files conf agent for to send.
+#directory_temp /tmp
+
+# Delay after generating the first data file for each agent to avoid
+# race conditions when auto-creating the agent, by default 2.
+startup_delay 0
+
+# Timezone offset: Difference with the server timezone
+timezone_offset 0
+
+# Timezone offset range (to set a randomnuber of hours of difference with the
+# server so timezone_offset can go from timezone_offset-timezone_offset_range
+# to timezone_offset+timezone_offset_range
+timezone_offset_range 0
+
+# Agent position paramters
+# Those parameters define the center and the zone where the agents will be
+# randomly located.
+# The base parameters define the central point of the sistem and the radius
+# defines how far from that point the agents will be placed in any direction
+
+# Base latitude reference for all agents
+latitude_base 40.42056
+# Base longitude reference for all agents
+longitude_base -3.708187
+# Base altitude reference for all agents
+altitude_base 0
+# This amount divided by 100 defines how far from each reference coordinate
+# the agents will go
+position_radius 10
+
+# Address of the Tentacle server where XML files will be sent (optional).
+server_ip 127.0.0.1
+
+# Local copy XML files, by default 0
+local_copy 1
+
+# Local dir for to copy XML files in local send method, by defaul /var/spool/pandora/data_in
+local_dir /var/spool/pandora/data_in
+
+# Port of the Tentacle server, by default 41121.
+# server_port 41121
+
+# Module definitions. Similar to pandora_agent.conf.
+
+module_begin
+module_name Connections opened
+module_type generic_data
+module_description Network connections used in this machine
+module_exec type=RANDOM;variation=20;min=50;max=500
+module_unit conns
+module_min_critical 450
+module_min_warning 400
+module_attenuation 0.33
+module_attenuation_wdays 0 6
+module_end
+
+module_begin
+module_name Dropped Bits of nothing
+module_type generic_data
+module_description Simulation of big number with absolute nosense, real like life itself.
+module_exec type=RANDOM;variation=5;min=-5000;max=500000000
+module_unit gamusins
+module_end
+
+module_begin
+module_name Network Traffic (Incoming)
+module_type generic_data
+module_description Network throughtput for incoming data
+module_exec type=RANDOM;variation=50;min=0;max=1000000
+module_unit kbit/sec
+module_min_critical 900000
+module_attenuation 0.5
+module_attenuation_wdays 0 6
+module_end
+
+module_begin
+module_name Network Traffic (Outgoing)
+module_type generic_data
+module_description Network throughtput for Outgoing data
+module_exec type=RANDOM;variation=50;min=0;max=1000000
+module_unit kbit/sec
+module_min_critical 900000
+module_attenuation 0.1
+module_attenuation_wdays 0 6
+module_end
+
+module_begin
+module_name Server Status A
+module_type generic_proc
+module_description Status of my super-important daemon / service / process
+module_exec type=RANDOM;variation=1;min=0;max=500
+module_end
+
+module_begin
+module_name Server Status B
+module_type generic_proc
+module_description Status of my super-important daemon / service / process
+module_exec type=RANDOM;variation=1;min=0;max=300
+module_end
+
+module_begin
+module_name Server Status C
+module_type generic_proc
+module_description Status of my super-important daemon / service / process
+module_exec type=RANDOM;variation=1;min=0;max=1000
+module_end
+
+module_begin
+module_name CPU Usage
+module_type generic_data
+module_description % of CPU usage in this machine
+module_unit %
+module_exec type=SCATTER;prob=5;avg=10;min=0;max=80
+module_min_critical 90
+module_min_warning 60
+module_end
+
+module_begin
+module_name Disk_Free
+module_type generic_data
+module_description Disk space available in MB.
+module_unit MB
+module_exec type=CURVE;min=20;max=80;time_wave_length=3600;time_offset=0
+module_min_critical 0
+module_max_critical 10
+module_max_warning 20
+module_min_warning 10
+module_end
+
+module_begin
+module_name Memory_free
+module_type generic_data
+module_unit MB
+module_exec type=CURVE;min=5;max=8000;time_wave_length=360000;time_offset=0
+module_min_critical 0
+module_max_critical 50
+module_end
+
+module_begin
+module_name System Log File
+module_type generic_data_string
+module_description Messages from the system in logfile format
+module_exec type=RANDOM;variation=60;min=40;max=40
+module_end
+
+module_begin
+module_name Module source
+module_type generic_data
+module_description Module data generated from source
+module_exec type=SOURCE;src=pandora_xml_stress_module_source.txt
+module_end
\ No newline at end of file
diff --git a/pandora_server/util/load/pandora_xml_stress_module_source.txt b/pandora_server/util/load/pandora_xml_stress_module_source.txt
new file mode 100644
index 0000000000..aa442fdc93
--- /dev/null
+++ b/pandora_server/util/load/pandora_xml_stress_module_source.txt
@@ -0,0 +1,38 @@
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+0
+1
+12
+13
+12
+14
+12
+14
\ No newline at end of file
diff --git a/pandora_server/util/load/usernames.txt b/pandora_server/util/load/usernames.txt
new file mode 100644
index 0000000000..c1709cf5ae
--- /dev/null
+++ b/pandora_server/util/load/usernames.txt
@@ -0,0 +1,34 @@
+Martyna
+Niklas
+Murugan
+Martin
+Celeste
+Agi
+Yeshua
+Lemminkainen
+Xabier
+Dominga
+Moric
+Gernot
+Nia
+Gurpreet
+Khristofor
+Ndubuisi
+Kleopatra
+Voestaae
+Melba
+Manish
+Tóki
+Pio
+Jeong
+Helena
+Plácido
+Djehutimesu
+Tauno
+Iordanus
+Ragnar
+Lucinde
+Kailash
+Artemio
+Victorina
+Sakine
\ No newline at end of file
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index fbe7655596..2984ff944d 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.772 Build 230720";
+my $version = "7.0NG.772 Build 230731";
 
 # Pandora server configuration
 my %conf;
@@ -135,7 +135,16 @@ sub pandora_purgedb ($$$) {
 			}
 		}
 	}
-		
+
+	# Delete manually disabled  agents after some period
+	if (defined ($conf->{'_delete_disabled_agents'}) && $conf->{'_delete_disabled_agents'} > 0) {
+		log_message('PURGE', "Deleting old disabled agents (More than " . $conf->{'_delete_disabled_agents'} . " days).");
+		db_do ($dbh, "DELETE FROM tagente 
+				  	  WHERE UNIX_TIMESTAMP(ultimo_contacto) + ? < UNIX_TIMESTAMP(NOW())
+				   	  AND disabled = 1
+				   	  AND modo != 2", $conf->{'_delete_disabled_agents'} * 8600);
+	}
+
 	# Delete old data
 	if ($conf->{'_days_purge'} > 0) {
 
@@ -408,14 +417,6 @@ sub pandora_purgedb ($$$) {
 	log_message ('PURGE', 'Deleting old tgraph_source data.');
 	db_do ($dbh,"DELETE FROM tgraph_source WHERE id_graph NOT IN (SELECT id_graph FROM tgraph)");
 
-
-	# Delete network traffic old data.
-	log_message ('PURGE', 'Deleting old network matrix data.');
-	if ($conf->{'_delete_old_network_matrix'} > 0) {
-		my $matrix_limit = time() - 86400 * $conf->{'_delete_old_network_matrix'};
-		db_do ($dbh, "DELETE FROM tnetwork_matrix WHERE utimestamp < ?", $matrix_limit);
-	}
-
 	# Delete old messages
 	log_message ('PURGE', "Deleting old messages.");
 	if ($conf->{'_delete_old_messages'} > 0) {
@@ -599,7 +600,6 @@ sub pandoradb_load_history_conf($) {
 
 	$options{'_days_autodisable_deletion'} = 0 unless defined ($options{'_days_autodisable_deletion'});
 	$options{'_num_past_special_days'} = 0 unless defined($options{'_num_past_special_days'});
-	$options{'_delete_old_network_matrix'} = 0 unless defined($options{'_delete_old_network_matrix'});
 	$options{'_delete_old_messages'} = 0 unless defined($options{'_delete_old_messages'});
 	$options{'_netflow_max_lifetime'} = 0 unless defined($options{'_netflow_max_lifetime'});
 	$options{'claim_back_snmp_modules'} = 0 unless defined($options{'claim_back_snmp_modules'});
@@ -694,8 +694,8 @@ sub pandora_load_config_pdb ($) {
 	$conf->{'_days_delete_not_initialized'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'days_delete_not_initialized'");
 	$conf->{'_delete_notinit'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'delete_notinit'");
 	$conf->{'_inventory_purge'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'inventory_purge'");
+	$conf->{'_delete_disabled_agents'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'delete_disabled_agents'");
 	$conf->{'_delete_old_messages'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'delete_old_messages'");
-	$conf->{'_delete_old_network_matrix'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'delete_old_network_matrix'");
 	$conf->{'_enterprise_installed'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'enterprise_installed'");
 	$conf->{'_metaconsole'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'metaconsole'");
 	$conf->{'_netflow_max_lifetime'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'netflow_max_lifetime'");
@@ -1252,6 +1252,9 @@ sub pandoradb_main {
 	# Maintain Referential integrity and other stuff
 	pandora_checkdb_integrity ($conf, $dbh);
 
+	# Close and open error log blocks
+	handle_error_log_block($conf, $dbh);
+
 	# Move old data to the history DB
 	if (defined ($history_dbh)) {
 		undef ($history_dbh) unless defined (enterprise_hook ('pandora_historydb', [$dbh, $history_dbh, $conf->{'_history_db_days'}, $conf->{'_history_db_step'}, $conf->{'_history_db_delay'}, $conf->{'_history_db_string_days'}, $conf->{'_history_db_adv'}]));
@@ -1327,6 +1330,23 @@ sub pandora_check_forgotten_discovery_tasks {
 		log_message('FORGOTTEN DISCOVERY TASKS', 'Step ended');
 }
 
+###############################################################################
+# Opening and closing of error log blocks 
+###############################################################################
+sub handle_error_log_block {
+    my ($conf, $dbh) = @_;
+	my $is_open = get_db_value ($dbh,"SELECT `value` FROM `tconfig` WHERE `token` = 'open_error_log'");
+	open (STDERR, ">> " . $conf->{'errorlog_file'}) or die " [ERROR] " . pandora_get_initial_product_name() . " can't write to Errorlog. Aborting : \n $! \n";
+	
+	if (!defined ($is_open)) {
+		db_do($dbh, "INSERT INTO `tconfig`(`token`, `value`) VALUES ('open_error_log', 1)");
+	} elsif ($is_open eq 1){
+		print STDERR strftime ("%Y-%m-%d %H:%M:%S", localtime()) . ' - ' . $conf->{'servername'} . " pandora_db: pandora_db maintenance tasks ends\n";
+	}
+
+	print STDERR strftime ("%Y-%m-%d %H:%M:%S", localtime()) . ' - ' . $conf->{'servername'} . " pandora_db: pandora_db maintenance tasks starts\n"; 
+	close (STDERR);
+}
 
 # Init
 pandora_init_pdb(\%conf);
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 79b4d5a020..b2801c6b44 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.772 Build 230720";
+my $version = "7.0NG.772 Build 230731";
 
 # save program name for logging
 my $progname = basename($0);
@@ -4544,7 +4544,7 @@ sub cli_create_event() {
 		print_log "[INFO] Adding event '$event' for agent '$agent_name' \n\n";
 
 		pandora_event ($conf, $event, $id_group, $id_agent, $severity,
-			$id_alert_agent_module, $id_agentmodule, $event_type, $event_status, $dbh, safe_input($source), $user_name, safe_input($comment), safe_input($id_extra), safe_input($tags), safe_input($c_instructions), safe_input($w_instructions), safe_input($u_instructions), $custom_data, undef, undef, $server_id);
+			$id_alert_agent_module, $id_agentmodule, $event_type, $event_status, $dbh, safe_input($source), $user_name, $comment, safe_input($id_extra), safe_input($tags), safe_input($c_instructions), safe_input($w_instructions), safe_input($u_instructions), $custom_data, undef, undef, $server_id);
 
 	}
 }
@@ -4692,8 +4692,6 @@ sub cli_get_event_info () {
 		print $csv_separator;
 		print $event_data->{'criticity'};
 		print $csv_separator;
-		print $event_data->{'user_comment'};
-		print $csv_separator;
 		print $event_data->{'tags'};
 		print $csv_separator;
 		print $event_data->{'source'};
@@ -4723,27 +4721,18 @@ sub cli_add_event_comment() {
 	
 	my $event_name = pandora_get_event_name($dbh, $id_event);
 	exist_check($event_name,'event',$id_event);
-	
-	my $current_comment = encode_utf8(pandora_get_event_comment($dbh, $id_event)); 
-	my $utimestamp = time ();
-	my @additional_comment = ({ comment => safe_input($comment), action => "Added comment", id_user => $id_user, utimestamp => $utimestamp, event_id => $id_event});
-	
+
 	print_log "[INFO] Adding event comment for event '$id_event'. \n\n";
 	
-	my $decoded_comment;
-	my $update;
-	if ($current_comment eq '') {
-		$update->{'user_comment'} = encode_json \@additional_comment;
-	}
-	else {
-		$decoded_comment = decode_json($current_comment);
-		
-		push(@{$decoded_comment}, @additional_comment);
-		
-		$update->{'user_comment'} = encode_json($decoded_comment);
-	}
-	
-	pandora_update_event_from_hash ($update, 'id_evento', $id_event, $dbh);
+	my $parameters;
+	$parameters->{'id_event'} = $id_event;
+	$parameters->{'id_user'} = $user_name;
+	$parameters->{'utimestamp'} = time();
+	$parameters->{'action'} = "Added comment";
+	$parameters->{'comment'} = safe_input($comment);
+
+	my $comment_id = db_process_insert($dbh, 'id', 'tevent_comment', $parameters);
+	return $comment_id;
 }
 
 ##############################################################################
@@ -6708,12 +6697,12 @@ sub pandora_update_event_from_hash ($$$$) {
 # Return event comment given a event id
 ##############################################################################
 
-sub pandora_get_event_comment($$) {
+sub pandora_get_event_comments($$) {
 	my ($dbh,$id_event) = @_;
 
-	my $event_name = get_db_value($dbh, 'SELECT user_comment FROM tevento WHERE id_evento = ?',$id_event);
+	my @comments = get_db_rows($dbh, 'SELECT * FROM tevent_comment WHERE id_evento = ?',$id_event);
 
-	return defined ($event_name) ? $event_name : -1;
+	return \@comments;
 }
 
 ##############################################################################
diff --git a/tentacle/Makefile.PL b/tentacle/Makefile.PL
index cc444b8524..94156d5731 100644
--- a/tentacle/Makefile.PL
+++ b/tentacle/Makefile.PL
@@ -15,7 +15,7 @@ WriteMakefile(
 	) :(),
 
 	NAME            => 'PandoraFMS',
-	AUTHOR 			=> 'Artica ST <info@artica.es>',
+	AUTHOR 			=> 'Pandora FMS <info@pandorafms.com>',
 	EXE_FILES 		=> [ @exe_files ],
 	PMLIBDIRS  		=> [ 'lib' ],
 	'dist'		=> { 'TAR' => 'tar', 'TARFLAGS' => 'cvfz', 'SUFFIX' => '.gz', 'COMPRESS' => 'gzip'}