Merge branch 'develop' into ent-11547-diferenciar-about-para-usuarios-no-admin

2023-08-23 09:44:03 +02:00 · 2023-08-23 09:44:03 +02:00 · ba606fa47a
parent 04a45e84a8 1fa70b3afc
commit ba606fa47a
349 changed files with 75319 additions and 35650 deletions
--- 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
--- 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."
--- 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
--- 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)

--- a/extras/docker/centos8/docker-compose.yml
+++ b/extras/docker/centos8/docker-compose.yml
@ -32,6 +32,7 @@ services:
      PUBLICURL: ""
      SLEEP: 5
      RETRIES: 10
+      TZ: 'Europe/Madrid'
    networks:
     - pandora
    ports:
--- a/extras/docker/centos8/pandora-stack/Dockerfile
+++ b/extras/docker/centos8/pandora-stack/Dockerfile
@ -10,6 +10,8 @@ ENV DBPORT=3306
 ENV SLEEP=5
 ENV RETRIES=1
 ENV OPEN=1
+ENV TZ='Europe/Madrid'
+

 ENV LC_ALL=C

--- a/extras/docker/centos8/pandora-stack/sources/init_pandora.sh
+++ b/extras/docker/centos8/pandora-stack/sources/init_pandora.sh
@ -230,6 +230,10 @@ fi
 echo "" > /opt/pandora/crontasks || touch /opt/pandora/crontasks


+#set localtime
+rm -rf /etc/localtime
+ln -s /usr/share/zoneinfo/$TZ /etc/localtime
+
 #install pandora packages
 echo "-> Istalling pandorafms"
 cd /opt/pandora
--- a/extras/pandora_update_version.sh
+++ b/extras/pandora_update_version.sh
@ -28,6 +28,7 @@ $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spe
 $CODEHOME/pandora_console/pandora_console.redhat.spec \
 $CODEHOME/pandora_console/pandora_console.rhel7.spec \
 $CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \
+$CODEHOME/pandora_agents/unix/pandora_agent.redhat_bin.spec\
 $CODEHOME/pandora_server/pandora_server.redhat.spec \
 $PANDHOME_ENT/pandora_agents/pandora_agent.spec \
 $PANDHOME_ENT/pandora_server/pandora_server_enterprise.redhat.spec \
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, AIX version
+# Version 7.0NG.773.1, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- 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 difﬁculty 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 ﬁle, called data ﬁle.
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, FreeBSD Version
+# Version 7.0NG.773.1, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, HP-UX Version
+# Version 7.0NG.773.1, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, GNU/Linux
+# Version 7.0NG.773.1, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, GNU/Linux
+# Version 7.0NG.773.1, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, Solaris Version
+# Version 7.0NG.773.1, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2023 Pandora FMS 
-# Version 7.0NG.772
+# Version 7.0NG.773.1
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
 # Foundation; either version 2 of the Licence or any later version
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.772, AIX version
+# Version 7.0NG.773.1, AIX version

 # General Parameters
 # ==================
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.772
+# Version 7.0NG.773.1
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena

--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.772, HPUX Version
+# Version 7.0NG.773.1, HPUX Version

 # General Parameters
 # ==================
--- 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 difﬁculty 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 ﬁle, called data ﬁle.
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772
+# Version 7.0NG.773.1
 # Licensed under GPL license v2,
 # (c) 2003-2023 Pandora FMS
 # please visit http://pandora.sourceforge.net
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772
+# Version 7.0NG.773.1
 # Licensed under GPL license v2,
 # (c) 2003-2023 Pandora FMS
 # please visit http://pandora.sourceforge.net
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772
+# Version 7.0NG.773.1
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net

--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.772, Solaris version
+# Version 7.0NG.773.1, Solaris version

 # General Parameters
 # ==================
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, AIX version
+# Version 7.0NG.773.1, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@ -1,10 +1,10 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.772-230719
+Version: 7.0NG.773.1-230823
 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 difﬁculty 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 ﬁle, called data ﬁle.
--- 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-230719"
+pandora_version="7.0NG.773.1-230823"

 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
@ -42,6 +42,7 @@ mkdir -p temp_package/usr/bin/
 mkdir -p temp_package/usr/sbin/
 mkdir -p temp_package/etc/pandora/plugins
 mkdir -p temp_package/etc/pandora/collections
+mkdir -p temp_package/etc/pandora/ref
 mkdir -p temp_package/etc/pandora/trans
 mkdir -p temp_package/etc/pandora/commands
 mkdir -p temp_package/etc/init.d/
--- a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
+++ b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
@ -31,7 +31,7 @@ fi
 if [ "$#" -ge 2 ]; then
 	VERSION="$2"
 else
-	VERSION="7.0NG.772"
+	VERSION="7.0NG.773.1"
 fi

 # Path for the generated DMG file
--- a/pandora_agents/unix/Darwin/dmg/extras/distribution.xml
+++ b/pandora_agents/unix/Darwin/dmg/extras/distribution.xml
@ -19,11 +19,11 @@
    <choice id="com.pandorafms.pandorafms_src" visible="false">
        <pkg-ref id="com.pandorafms.pandorafms_src"/>
    </choice>
-    <pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.772" onConclusion="none">pandorafms_src.pdk</pkg-ref>
+    <pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.773.1" onConclusion="none">pandorafms_src.pdk</pkg-ref>
    <choice id="com.pandorafms.pandorafms_uninstall" visible="true" customLocation="/Applications">
        <pkg-ref id="com.pandorafms.pandorafms_uninstall"/>
    </choice>
-    <pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.772" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
+    <pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.773.1" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
 <!-- <installation-check script="check()" />
 	<script>
 	<![CDATA[
--- a/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS
+++ b/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS
@ -5,9 +5,9 @@
 	<key>CFBundleIconFile</key>                  <string>pandorafms.icns</string>
    <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>CFBundleShortVersionString</key> <string>7.0NG.772</string>
+    <key>CFBundleVersion</key>            <string>7.0NG.773.1</string>
+    <key>CFBundleGetInfoString</key>      <string>7.0NG.773.1 Pandora FMS on Aug 2020</string>
+    <key>CFBundleShortVersionString</key> <string>7.0NG.773.1</string>
 	
    <key>NSPrincipalClass</key><string>NSApplication</string>
    <key>NSMainNibFile</key><string>MainMenu</string>
--- a/pandora_agents/unix/Darwin/dmg/scripts/postinstall
+++ b/pandora_agents/unix/Darwin/dmg/scripts/postinstall
@ -30,6 +30,7 @@ else
 	mkdir -p /usr/local/share/man/man1/
 	mkdir -p /usr/local/share/pandora_agent/collections/
 	mkdir -p /usr/local/share/pandora_agent/commands/
+	mkdir -p /usr/local/share/pandora_agent/ref/
 	mkdir -p /etc/pandora/
 	mkdir -p /var/spool/pandora/data_out/
 	mkdir -p /var/log/pandora/
@ -39,6 +40,7 @@ else
 	# Setting permissions to directories and files
 	chmod -R 700 /usr/local/share/pandora_agent/collections
 	chmod -R 700 /usr/local/share/pandora_agent/commands
+	chmod -R 700 /usr/local/share/pandora_agent/ref
 	chmod -R 755 /etc/pandora/
 	chmod -R 700 /var/spool/pandora/data_out
 	chmod -R 711 /var/log/pandora
@ -69,6 +71,7 @@ chown root:wheel /usr/local/bin/tentacle_client
 ln -s /usr/local/share/pandora_agent/plugins /etc/pandora/plugins
 ln -s /usr/local/share/pandora_agent/commands /etc/pandora/commands
 ln -s /usr/local/share/pandora_agent/collections /etc/pandora/collections
+ln -s /usr/local/share/pandora_agent/ref /etc/pandora/ref


 # Copy manuals
@ -90,4 +93,4 @@ echo "/var/log/pandora/pandora_agent.log        :        640        5        204
 # Clean all install utilites
 rm -Rf inst_utilities

-exit 0
+exit 0
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, GNU/Linux
+# Version 7.0NG.773.1, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, FreeBSD Version
+# Version 7.0NG.773.1, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, HP-UX Version
+# Version 7.0NG.773.1, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772
+# Version 7.0NG.773.1
 # Licensed under GPL license v2,
 # Copyright (c) 2004-2023 Pandora FMS
 # https://pandorafms.com
@ -310,3 +310,9 @@ module_plugin autodiscover --default
 #module_description Zombies process on system
 #module_group System
 #module_end
+
+#Hardening plugin for security compliance analysis. Enable to use it.
+#module_begin
+#module_plugin /usr/share/pandora_agent/plugins/pandora_sca
+#module_absoluteinterval 7d
+#module_end
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, GNU/Linux
+# Version 7.0NG.773.1, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, NetBSD Version
+# Version 7.0NG.773.1, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.772, Solaris Version
+# Version 7.0NG.773.1, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@ -1003,7 +1003,7 @@ use strict;
 use warnings;

 use Scalar::Util qw(looks_like_number);
-use POSIX qw(strftime floor);
+use POSIX qw(ceil floor strftime);
 use Sys::Hostname;
 use File::Basename;
 use File::Copy;
@ -1030,8 +1030,8 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;

-use constant AGENT_VERSION => '7.0NG.772';
-use constant AGENT_BUILD => '230719';
+use constant AGENT_VERSION => '7.0NG.773.1';
+use constant AGENT_BUILD => '230823';

 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
@ -1121,6 +1121,7 @@ my %DefaultConf = (
 	'server_path_md5' => 'md5', #undocumented
 	'server_path_conf' => 'conf', #undocumented
 	'server_path_zip' => 'collections', #undocumented
+	'server_path_ref' => 'ref', #undocumented
 	'logfile' =>'/var/log/pandora/pandora_agent.log',
 	'logsize' => DEFAULT_MAX_LOG_SIZE,
 	'logrotate' => DEFAULT_LOG_ROTATE,
@ -1569,6 +1570,34 @@ sub parse_conf_modules($) {
 			$module->{'post_process'} = $1;
 		} elsif ($line =~ /^\s*module_interval\s+(\d+)\s*$/) {
 			$module->{'interval'} = $1;
+		} elsif ($line =~ /^\s*module_absoluteinterval\s+(.*)$/) {
+			my $absolute_interval = $1;
+			if ($absolute_interval eq 'once') {
+					$module->{'absoluteinterval'} = 0;
+			} elsif ($absolute_interval =~ /^(\d+)([smhd])?\s*$/) {
+				if (defined($2)) {
+					# Seconds.
+					if ($2 eq 's') {
+						$module->{'absoluteinterval'} = int($1);
+					}
+					# Minutes (convert to seconds).
+					elsif ($2 eq 'm') {
+						$module->{'absoluteinterval'} = int($1) * 60;
+					}
+					# Hours (convert to seconds).
+					elsif ($2 eq 'h') {
+						$module->{'absoluteinterval'} = int($1) * 3600;
+					}
+					# Days (convert to seconds).
+					elsif ($2 eq 'd') {
+						$module->{'absoluteinterval'} = int($1) * 86400;
+					}
+				} else {
+					$module->{'absoluteinterval'} = int($1) * $Conf{'interval'};
+				}
+			} else {
+				log_message ('setup', "Invalid value for module_absoluteinterval: $absolute_interval");
+			}
 		} elsif ($line =~ /^\s*module_timeout\s+(\d+)\s*$/) {
 			$module->{'timeout'} = $1;
 		} elsif ($line =~ /^\s*module_save\s+(\w+)$/) {
@ -1636,6 +1665,27 @@ sub parse_conf_modules($) {
 				next;
 			}

+			# Configure modules with an absolute interval.
+			if (defined($module->{'absoluteinterval'})) {
+
+				# Convert from seconds to actual agent intervals.
+				$module->{'interval'} = ceil($module->{'absoluteinterval'} / $Conf{'interval'});
+
+				# Make sure modules that run once are asynchronous.
+				if ($module->{'interval'} == 0) {
+					if ($module->{'type'} eq 'generic_data') {
+						$module->{'type'} = 'async_data';
+					} elsif ($module->{'type'} eq 'generic_proc') {
+						$module->{'type'} = 'async_proc';
+					} elsif ($module->{'type'} eq 'generic_data_string') {
+						$module->{'type'} = 'async_string';
+					}
+				}
+
+				# This file will be used for persistence.
+				$module->{'timestamp_file'} = $ConfDir . '/' . $Conf{'server_path_ref'} . '/' . md5($module->{'name'}) . '.ref';
+			}
+
 			# Set the intensive interval
 			if ($module->{'is_intensive'} == 1) {				
 				$module->{'intensive_interval'} = $module->{'interval'};
@ -1643,9 +1693,9 @@ sub parse_conf_modules($) {
 				$module->{'intensive_interval'} = $module->{'interval'} * ($Conf{'interval'} / $Conf{'intensive_interval'});
 			}

-			# Make the module run the first time
-			$module->{'counter'} = $module->{'intensive_interval'};
-			
+			# Initialize the module's execution counter.
+			init_counter($module);
+
 			# Replace macros
 			replace_macros ($module);

@ -2805,7 +2855,15 @@ sub exec_module {
 		}
 	}

-	if (++($module->{'counter'}) < $module->{'intensive_interval'}) {
+	# Modules that will run once.
+	if ($module->{'interval'} == 0) {
+		if ($module->{'counter'} == 0) {
+			$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
+			return;
+		}
+	}
+	# Modules that will run periodically.
+	elsif (++($module->{'counter'}) < $module->{'intensive_interval'}) {
 		$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
 		return;
 	}
@ -2862,6 +2920,9 @@ sub exec_module {
 		}
 	}
 	
+	# Save the module's timestamp to disk.
+	save_module_timestamp($module);
+
 	$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
 }

@ -3547,6 +3608,44 @@ sub check_module_cron {
 	return 0;
 }

+################################################################################
+# Initialize a module's internal execution counter.
+################################################################################
+sub init_counter($) {
+	my ($module) = @_;
+	
+	# Open the timestamp file if available.
+	my $fh;
+	if (!defined($module->{'timestamp_file'}) || 
+	    !open($fh, '<', $module->{'timestamp_file'})) {
+		# If intensive_interval is 0, setting counter to any value != 0 will make the module run.
+		$module->{'counter'} = $module->{'intensive_interval'} == 0 ? 1 : $module->{'intensive_interval'};
+		return;
+	}
+
+	# Read the timestamp from disk.
+	my $timestamp = int(<$fh>);
+	close($fh);
+
+	# Update the module's execution counter.
+	# If intensive_interval is 0, setting counter to 0 will prevent the module from running again.
+	$module->{'counter'} = $module->{'intensive_interval'} == 0 ? 0 : floor((time() - $timestamp) / $Conf{'interval'});
+}
+
+################################################################################
+# Save a module's execution timestamp to disk for persistence.
+################################################################################
+sub save_module_timestamp($) {
+	my ($module) = @_;
+
+	return if (!defined($module->{'timestamp_file'}));
+
+	# Update the time reference.
+	open(my $fh, '>', $module->{'timestamp_file'}) or return;
+	print $fh time();
+	close($fh);
+}
+
 ################################################################################
 # Write module data in XML format.
 ################################################################################
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
-%define version     7.0NG.772
-%define release     230719
+%define version     7.0NG.773.1
+%define release     230823

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
@ -25,7 +25,7 @@ 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)
+Requires:           perl(Sys::Syslog) perl(IO::Compress::Zip) perl(File::Copy) perl(Sys::Hostname)
 # Required by plugins
 #Requires:           sh-utils sed passwd net-tools rpm
 AutoReq:            0
@ -100,6 +100,11 @@ if [ ! -e /etc/pandora/collections ]; then
 	ln -s /usr/share/pandora_agent/collections /etc/pandora
 fi

+if [ ! -e /etc/pandora/ref ]; then
+	mkdir -p /usr/share/pandora_agent/ref
+	ln -s /usr/share/pandora_agent/ref /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
@ -143,7 +148,7 @@ fi

 # Remove symbolic links
 pushd /etc/pandora
-for f in pandora_agent.conf plugins collections
+for f in pandora_agent.conf plugins collections ref
 do
 	[ -L $f ] && rm -f $f
 done
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@ -0,0 +1,166 @@
+#
+#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.773
+%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:          x86_64
+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:           libnsl
+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
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
-%define version     7.0NG.772
-%define release     230719
+%define version     7.0NG.773.1
+%define release     230823

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
@ -94,6 +94,10 @@ if [ ! -e /etc/pandora/collections ]; then
 	mkdir /etc/pandora/collections
 fi

+if [ ! -e /etc/pandora/ref ]; then
+	mkdir /etc/pandora/ref
+fi
+
 if [ ! -e /etc/pandora/commands ]; then
 	mkdir /etc/pandora/commands
 fi
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@ -9,8 +9,8 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************

-PI_VERSION="7.0NG.772"
-PI_BUILD="230719"
+PI_VERSION="7.0NG.773.1"
+PI_BUILD="230823"
 OS_NAME=`uname -s`

 FORCE=0
@ -408,6 +408,11 @@ install () {
 	chmod -R 700 $PANDORA_BASE$PANDORA_HOME/commands
 	ln -s $PANDORA_BASE_REAL$PANDORA_HOME/commands $PANDORA_BASE$PANDORA_CFG
 	
+	echo "Creating the ref directory in to $PANDORA_BASE$PANDORA_HOME/ref..."
+	mkdir -p $PANDORA_BASE$PANDORA_HOME/ref
+	chmod -R 700 $PANDORA_BASE$PANDORA_HOME/ref
+	ln -s $PANDORA_BASE_REAL$PANDORA_HOME/ref $PANDORA_BASE$PANDORA_CFG
+
 	if [ $WITHOUT_TENTACLE_SERVER -eq 0 ]
 	then
 		echo "Copying tentacle server to $PANDORA_BASE$TENTACLE_SERVER"
@ -541,8 +546,17 @@ install () {
 	then
 		echo "Define 'pandora_agent=\"YES\"' in /etc/rc.conf to enable the daemon."
 	else
-		echo "Check your startup configuration to be sure Pandora FMS Agent is ready "
-		echo "to start automatically when system restarts":
+		# Enable startup service
+		if [ `command -v systemctl` ]
+		then
+			systemctl enable pandora_agent_daemon
+		elif [ `command -v chkconfig` ]
+		then
+			chkconfig pandora_agent_daemon on
+		else
+			echo "Check your startup configuration to be sure Pandora FMS Agent is ready "
+			echo "to start automatically when system restarts":
+		fi
 	fi

 	# Restore the daemon script
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2023 Pandora FMS 
-# Version 7.0NG.772
+# Version 7.0NG.773.1
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
 # Foundation; either version 2 of the Licence or any later version
@ -522,5 +522,4 @@ module_plugin "%PROGRAMFILES%\Pandora_Agent\util\autodiscover.exe" --default
 #module_type generic_data_string
 #module_exec echo Bordón
 #module_native_encoding OEM
-#module_end
-
+#module_end
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}

 AppName
-{Pandora FMS Windows Agent v7.0NG.772}
+{Pandora FMS Windows Agent v7.0NG.773.1}

 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@ -186,7 +186,7 @@ UpgradeApplicationID
 {}

 Version
-{230719}
+{230823}

 ViewReadme
 {Yes}
--- a/pandora_agents/win32/misc/pandora_file.h
+++ b/pandora_agents/win32/misc/pandora_file.h
@ -31,6 +31,10 @@ using namespace std;
 * File operations.
 */
 namespace Pandora_File {
+
+	/* Size of a buffer that will be passed to Pandora_File::md5. */
+	const int MD5_BUF_SIZE = 33;
+
 	/**
 	 * File super-class exception.
 	 */
--- a/pandora_agents/win32/modules/pandora_module.cc
+++ b/pandora_agents/win32/modules/pandora_module.cc
@ -19,11 +19,14 @@
 */

 #include "pandora_module.h"
+#include "pandora_windows_service.h"
+#include "../misc/pandora_file.h"
 #include "../pandora_strutils.h"
 #include "../pandora.h"

 #include <iostream>
 #include <sstream>
+#include <cmath>

 #define BUFSIZE 4096 

@ -472,18 +475,27 @@ Pandora_Module::setNoOutput () {
 */
 void
 Pandora_Module::run () {
-	/* Check the interval */
-	if (this->executions % this->intensive_interval != 0) {
+
+	// Run once.
+	if (this->intensive_interval == 0) {
+		if (this->executions == 0) {
+			has_output = false;
+			throw Interval_Not_Fulfilled ();
+		}
+	}
+	// Run periodically.
+	else if (++this->executions < this->intensive_interval) {
 		pandoraDebug ("%s: Interval is not fulfilled", this->module_name.c_str ());
-		this->executions++;
 		has_output = false;
 		throw Interval_Not_Fulfilled ();
 	} 
 	
-	/* Increment the executions after check. This is done to execute the
-	   first time */
-	this->executions++;
+	// Reset the execution counter.
+	this->executions = 0;
 	has_output = true;
+
+	// Update the execution timestamp.
+	this->updateTimestampFile();
 }

 /** 
@ -1663,6 +1675,63 @@ Pandora_Module::getTimestamp () {
 	return this->timestamp;
 }

+/** 
+ * Sets the module timestamp file.
+ * 
+ * @param file_name The name of the timestamp file.
+ */
+void
+Pandora_Module::setTimestampFile (string file_name) {
+	this->timestamp_file = file_name;
+}
+
+/** 
+ * Gets the module timestamp file.
+ * 
+ * @return The name of the timestamp file.
+ */
+string
+Pandora_Module::getTimestampFile () {
+	return this->timestamp_file;
+}
+
+/** 
+ * Update the timestamp file with the current time.
+ * 
+ */
+void
+Pandora_Module::updateTimestampFile () {
+	try {
+		Pandora_File::writeFile(this->timestamp_file, std::to_string(std::time(NULL)));
+	} catch (...) {
+		/* Ignore errors. */
+	}
+}
+
+/** 
+ * Initialize the module's internal execution counter.
+ * 
+ */
+void
+Pandora_Module::initExecutions () {
+	string timestamp;
+
+	try {
+		if (this->timestamp_file != "" && Pandora_File::readFile(this->timestamp_file, timestamp) != FILE_NOT_FOUND) {
+			// If the interval is 0, setting executions to 0 will prevent the module from running.
+			this->executions = this->intensive_interval == 0 ?
+				0 :
+				floor((1000.0 * (std::time(NULL) - strtoint(timestamp))) / Pandora_Windows_Service::getInstance()->getInterval());
+			return;
+		}
+	} catch (...) {
+		// Ignore errors.
+	}
+
+	// If the interval is 0, setting executions to any value != 0 will make the module run.
+	this->executions = this->intensive_interval == 0 ? 1 : this->intensive_interval;
+}
+
 /** 
 * Sets the value of intensive_match.
 * 
--- a/pandora_agents/win32/modules/pandora_module.h
+++ b/pandora_agents/win32/modules/pandora_module.h
@ -171,6 +171,7 @@ namespace Pandora_Modules {
 		Cron				  *cron;
 		list<Condition *>     *intensive_condition_list;
 		time_t                timestamp;
+		string                timestamp_file;
 		unsigned char         intensive_match;
 		int                   intensive_interval;
 		string                unit, custom_id, str_warning, str_critical;
@ -238,6 +239,7 @@ namespace Pandora_Modules {
 		bool         getAsync ();
 		void         setExecutions(long executions=0);
 		long         getExecutions();
+		void         initExecutions ();

 		virtual string getXml      ();

@ -303,6 +305,9 @@ namespace Pandora_Modules {
 		int         hasOutput ();
 		void        setTimestamp (time_t timestamp);
 		time_t      getTimestamp ();
+		void        setTimestampFile (string file_name);
+		string      getTimestampFile ();
+		void        updateTimestampFile ();
 		void        setIntensiveMatch (unsigned char intensive_match);
 		unsigned char getIntensiveMatch ();
 		bool        isIntensive ();
--- a/pandora_agents/win32/modules/pandora_module_factory.cc
+++ b/pandora_agents/win32/modules/pandora_module_factory.cc
@ -41,7 +41,10 @@
 #include "pandora_module_snmpget.h"
 #include "../windows/pandora_wmi.h"
 #include "../pandora_strutils.h"
+#include "../misc/pandora_file.h"
+#include "../pandora.h"
 #include <list>
+#include <cmath>

 using namespace Pandora;
 using namespace Pandora_Modules;
@ -50,6 +53,7 @@ using namespace Pandora_Strutils;
 #define TOKEN_NAME          ("module_name ")
 #define TOKEN_TYPE          ("module_type ")
 #define TOKEN_INTERVAL      ("module_interval ")
+#define TOKEN_ABSOLUTEINTERVAL ("module_absoluteinterval ")
 #define TOKEN_EXEC          ("module_exec ")
 #define TOKEN_PROC          ("module_proc ")
 #define TOKEN_SERVICE       ("module_service ")
@ -156,7 +160,8 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 	list<string>::iterator iter;
 	string                 module_name, module_type, module_exec;
 	string                 module_min, module_max, module_description;
-	string                 module_interval, module_proc, module_service;
+	string                 module_interval, module_absoluteinterval;
+	string                 module_proc, module_service;
 	string                 module_freedisk, module_cpuusage, module_inventory;
 	string                 module_freedisk_percent, module_freememory_percent;
 	string                 module_dsn, module_freememory;
@ -196,6 +201,7 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 	module_max           = "";
 	module_description   = "";
 	module_interval      = "";
+	module_absoluteinterval = "";
 	module_exec          = "";
 	module_proc          = "";
 	module_service       = "";
@ -290,6 +296,9 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 		if (module_interval == "") {
 			module_interval = parseLine (line, TOKEN_INTERVAL);
 		}
+		if (module_absoluteinterval == "") {
+			module_absoluteinterval = parseLine (line, TOKEN_ABSOLUTEINTERVAL);
+		}
 		if (module_exec == "") {
 			module_exec = parseLine (line, TOKEN_EXEC);
 		}
@ -603,6 +612,13 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 					}
 				}

+				if (module_absoluteinterval != "") {
+					pos_macro = module_absoluteinterval.find(macro_name);
+					if (pos_macro != string::npos){
+						module_absoluteinterval.replace(pos_macro, macro_name.size(), macro_value);
+					}
+				}
+
 				if (module_exec != "") {
 					pos_macro = module_exec.find(macro_name);
 					if (pos_macro != string::npos){
@ -1323,6 +1339,61 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 		}
 	}

+	/* Set the module absolute interval */
+	if (module_absoluteinterval != "") {
+		int interval;
+		
+		try {
+			service = Pandora_Windows_Service::getInstance();
+
+			// Run once.
+			if (module_absoluteinterval == "once") {
+				interval = 0;
+			}
+			// Seconds.
+			else if (module_absoluteinterval.back() == 's') {
+				interval = strtoint (module_absoluteinterval.substr(0, module_absoluteinterval.size() - 1));
+			}
+			// Minutes.
+			else if (module_absoluteinterval.back() == 'm') {
+				interval = strtoint (module_absoluteinterval.substr(0, module_absoluteinterval.size() - 1)) * 60;
+			}
+			// Hours.
+			else if (module_absoluteinterval.back() == 'h') {
+				interval = strtoint (module_absoluteinterval.substr(0, module_absoluteinterval.size() - 1)) * 3600;
+			}
+			// Days.
+			else if (module_absoluteinterval.back() == 'd') {
+				interval = strtoint (module_absoluteinterval.substr(0, module_absoluteinterval.size() - 1)) * 86400;
+			}
+			// Number of agent intervals.
+			else {
+				interval = strtoint(module_absoluteinterval) * (service->getIntervalSec());
+			}
+
+			// Convert from seconds to agent executions.
+			interval = ceil(interval / double(service->getIntervalSec()));
+
+			// Set the module interval.
+			module->setInterval (interval);
+			module->setIntensiveInterval (interval);
+
+			// Compute the MD5 hash of the module's name.
+			char module_name_md5[Pandora_File::MD5_BUF_SIZE];
+			Pandora_File::md5(module_name.c_str(), module_name.size(), module_name_md5);
+
+			// Set the timestamp file.
+			module->setTimestampFile(Pandora::getPandoraInstallDir().append("/ref/").append(module_name_md5).append(".ref"));
+		} catch (Invalid_Conversion e) {
+			pandoraLog ("Invalid absolute interval value \"%s\" for module %s",
+			module_absoluteinterval.c_str (),
+			module_name.c_str ());
+		}
+		catch (...) {
+			// Should not happen. Ignore errors.
+		}
+	}
+
 	/* Module intensive condition */
 	if (intensive_condition_list.size () > 0) {
 		intensive_condition_iter = intensive_condition_list.begin ();
@ -1337,6 +1408,9 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 		module->setIntensiveInterval (module->getInterval () * (service->getInterval () / service->getIntensiveInterval ()));
 	}

+	/* Initialize the module's execution counter. */
+	module->initExecutions ();
+
 	/* Module cron */
 	module->setCron (module_crontab);

@ -1374,6 +1448,18 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 		numeric = false;
 	}

+	// Make sure modules that run once are asynchronous.
+	if (module->getInterval() == 0) {
+		type = module->getTypeInt();
+		if (type == TYPE_GENERIC_DATA) {
+			module->setType("async_data");
+		} else if (type == TYPE_GENERIC_PROC) {
+			module->setType("async_proc");
+		} else if (type == TYPE_GENERIC_DATA_STRING) {
+			module->setType("async_string");
+		}
+	}
+
 	if (numeric) {
 		if (module_max != "") {
 			try {
--- 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 230719")
+#define PANDORA_VERSION ("7.0NG.773.1 Build 230823")

 string pandora_path;
 string pandora_dir;
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@ -2197,6 +2197,11 @@ Pandora_Windows_Service::getInterval () {
 	return this->interval;
 }

+long
+Pandora_Windows_Service::getIntervalSec () {
+	return this->interval_sec;
+}
+
 long
 Pandora_Windows_Service::getIntensiveInterval () {
 	return this->intensive_interval;
--- a/pandora_agents/win32/pandora_windows_service.h
+++ b/pandora_agents/win32/pandora_windows_service.h
@ -122,6 +122,7 @@ namespace Pandora {
 		Pandora_Agent_Conf *getConf ();
 		string         getEHKey (string ehorus_conf);
 		long           getInterval ();
+		long           getIntervalSec ();
 		long           getIntensiveInterval ();
 		string         generateAgentName ();
 		bool           writeToBuffer (string temporal);
--- 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 230719))"
+      VALUE "ProductVersion", "(7.0NG.773.1(Build 230823))"
      VALUE "FileVersion", "1.0.0.0"
    END
  END
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@ -1,10 +1,10 @@
 package: pandorafms-console
-Version: 7.0NG.772-230719
+Version: 7.0NG.773.1-230823
 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.
--- 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-230719"
+pandora_version="7.0NG.773.1-230823"

 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 ..
--- 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",
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@ -261,12 +261,27 @@ function agents_modules_load_js()
        }

        function select_selected () {
-            // $('#id_agents2 option').each(function(){
-            //     if($(this).attr('selected') === 'selected'){
-            //         $(this).prop('selected', true);
-            //     }
-            // });
+            var f = document.forms.filter_form;
+            f.action = "index.php?sec=view&sec2=extensions/agents_modules";
+            $('#filter_form').submit();
        }
+        /* <![CDATA[ */
+        function export_csv() {
+            let group_id = $('#group_id option:selected').val();
+            let module_group_id = $('#modulegroup option:selected').val();
+            let agent_id = $('#id_agents2 option:selected').map((_, e) => e.value).get();
+            let module_id = $('#module option:selected').map((_, e) => e.value).get();
+
+            let filters_array = {group_id: group_id, module_group_id:module_group_id, agent_id:agent_id, module_id:module_id}
+            let jsonFilters = JSON.stringify(filters_array)
+            let filters = window.btoa(jsonFilters)
+            var f = document.forms.filter_form;
+
+            blockResubmit($(this));
+            f.action = "extensions/agents_modules_csv.php?get_agents_module_csv=1&filters="+filters;
+            $("#filter_form").submit();
+        }
+        /* ]]> */
    </script>
    <?php
 }
@ -653,7 +668,7 @@ function mainAgentsModules()
    }

    if ($config['pure'] != 1) {
-        $show_filters = '<form method="post" action="index.php?sec=view&sec2=extensions/agents_modules" class="w100p">';
+        $show_filters = '<form id="filter_form" method="post" action="index.php?sec=view&sec2=extensions/agents_modules" class="w100p">';
        $show_filters .= '<table class="filter-table-adv w100p no-border" cellpadding="4" cellspacing="4">';
            $show_filters .= '<tr>';
                $show_filters .= '<td width="33%">'.$filter_type.'</td>';
@ -679,6 +694,13 @@ function mainAgentsModules()
                        'onclick' => 'select_selected()',
                    ],
                    true
+                ).html_print_button(
+                    __('Export to CSV'),
+                    'srcbutton_csv',
+                    false,
+                    'export_csv()',
+                    ['class' => 'secondary mini'],
+                    true,
                ),
            ],
            true
--- a/pandora_console/extensions/agents_modules_csv.php
+++ b/pandora_console/extensions/agents_modules_csv.php
@ -0,0 +1,117 @@
+<?php
+/**
+ * Export data.
+ *
+ * @category   Tools
+ * @package    Pandora FMS
+ * @subpackage Operation
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ * |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ * |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Pandora FMS
+ * Please see https://pandorafms.com/community/ 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.
+ * ============================================================================
+ */
+
+
+/*
+    require_once $config['homedir'].'/include/config.php';
+    require_once $config['homedir'].'/include/functions_reporting.php';
+    require_once $config['homedir'].'/include/functions_modules.php';
+*/
+require_once '../include/config.php';
+require_once '../include/functions_agents.php';
+require_once '../include/functions_reporting.php';
+require_once '../include/functions_modules.php';
+require_once '../include/functions_users.php';
+
+global $config;
+
+check_login();
+
+// ACL Check.
+if (! check_acl($config['id_user'], 0, 'AR')) {
+    db_pandora_audit(
+        AUDIT_LOG_ACL_VIOLATION,
+        'Trying to access Agent view (Grouped)'
+    );
+    include 'general/noaccess.php';
+    exit;
+}
+
+
+$get_agents_module_csv = get_parameter('get_agents_module_csv', 0);
+
+
+if ($get_agents_module_csv === '1') {
+    // ***************************************************
+    // Header output
+    // ***************************************************
+    $config['ignore_callback'] = true;
+    while (@ob_end_clean()) {
+    }
+
+    $filename = 'agents_module_view_'.date('Ymd').'-'.date('His');
+
+    // Set cookie for download control.
+    setDownloadCookieToken();
+
+    header('Content-Type: text/csv');
+    header('Content-Disposition: attachment; filename="'.$filename.'.csv"');
+    // ***************************************************
+    // Data processing
+    // ***************************************************
+    echo pack('C*', 0xEF, 0xBB, 0xBF);
+
+    $json_filters = get_parameter('filters', '');
+
+    $filters = json_decode(
+        base64_decode(
+            get_parameter('filters', '')
+        ),
+        true
+    );
+
+    $results = export_agents_module_csv($filters);
+
+    $divider = $config['csv_divider'];
+    $dataend = PHP_EOL;
+
+    $header_fields = [
+        __('Agent'),
+        __('Module'),
+        __('Data'),
+    ];
+
+    $out_csv = '';
+    foreach ($header_fields as $key => $value) {
+        $out_csv .= $value.$divider;
+    }
+
+    $out_csv .= "\n";
+
+    foreach ($results as $result) {
+        foreach ($result as $key => $value) {
+            $out_csv .= io_safe_output($value).$divider;
+        }
+
+        $out_csv .= "\n";
+    }
+
+    echo io_safe_output($out_csv);
+
+    exit;
+}
--- a/pandora_console/extensions/api_checker.php
+++ b/pandora_console/extensions/api_checker.php
@ -157,7 +157,6 @@ function extension_api_checker()
    }

    $url = io_safe_output(get_parameter('url', ''));
-
    $ip = io_safe_output(get_parameter('ip', '127.0.0.1'));
    $pandora_url = io_safe_output(get_parameter('pandora_url', $config['homeurl_static']));
    $apipass = io_safe_output(get_parameter('apipass', ''));
@ -175,6 +174,17 @@ function extension_api_checker()

    $api_execute = (bool) get_parameter('api_execute', false);

+    if ($url !== '') {
+        $validate_url = parse_url($url);
+        if ($validate_url['scheme'] === 'http' || $validate_url['scheme'] === 'https') {
+            ui_print_success_message(__('Request successfully processed'));
+        } else {
+            ui_print_error_message(__('Incorrect URL'));
+            $url = '';
+            $api_execute = false;
+        }
+    }
+
    $return_call_api = '';
    if ($api_execute === true) {
        $return_call_api = api_execute(
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@ -453,7 +453,7 @@ function resource_exportation_extension_main()
            true
        )
    );
-    $table->data[0][] = html_print_button(__('Export'), '', false, 'export_to_ptr("report");', ['mode' => 'link'], true);
+    $table->data[0][] = html_print_button(__('Export'), '', false, 'export_to_ptr("report");', '', true);

    $table->data[1][] = html_print_label_input_block(
        __('Visual console'),
@ -465,7 +465,7 @@ function resource_exportation_extension_main()
            true
        )
    );
-    $table->data[1][] = html_print_button(__('Export'), '', false, 'export_to_ptr("visual_console");', ['mode' => 'link'], true);
+    $table->data[1][] = html_print_button(__('Export'), '', false, 'export_to_ptr("visual_console");', '', true);

    if ($hook_enterprise === true) {
        add_rows_for_enterprise($table->data);
--- a/pandora_console/extras/delete_files/delete_files.txt
+++ b/pandora_console/extras/delete_files/delete_files.txt
@ -1702,4 +1702,9 @@ enterprise/meta/monitoring/wizard/wizard.module.network.php
 enterprise/meta/monitoring/wizard/wizard.module.web.php
 enterprise/meta/monitoring/wizard/wizard.php
 enterprise/meta/monitoring/wizard/wizard.update_agent.php
-enterprise/meta/monitoring/wizard/wizard.update_module.php
+enterprise/meta/monitoring/wizard/wizard.update_module.php
+enterprise/godmode/wizards/Applications.class.php
+enterprise/godmode/wizards/Cloud.class.php
+enterprise/images/wizard/applications.png
+enterprise/images/wizard/cloud.png
+enterprise/images/wizard/consoletasks.png
--- a/pandora_console/extras/mr/65.sql
+++ b/pandora_console/extras/mr/65.sql
--- a/pandora_console/extras/mr/66.sql
+++ b/pandora_console/extras/mr/66.sql
@ -0,0 +1,13 @@
+START TRANSACTION;
+
+
+UPDATE `twelcome_tip`
+	SET title = 'Scheduled&#x20;downtimes',
+         url = 'https://pandorafms.com/manual/en/documentation/04_using/11_managing_and_administration#scheduled_downtimes'
+	WHERE title = 'planned&#x20;stops';
+
+UPDATE tagente_modulo SET `tcp_send` = '2c' WHERE `tcp_send` = '2';
+UPDATE tpolicy_modules SET `tcp_send` = '2c' WHERE `tcp_send` = '2';
+UPDATE tnetwork_component SET `tcp_send` = '2c' WHERE `tcp_send` = '2';
+
+COMMIT;
--- a/pandora_console/general/admin_maintenance_mode.php
+++ b/pandora_console/general/admin_maintenance_mode.php
@ -0,0 +1,81 @@
+<?php
+/**
+ * Static page to lock access to console
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage Applications.VMware
+ * @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.
+ui_require_css_file('maintenance');
+?>
+<html>
+<body>
+
+    <div class="responsive center padding-6">
+        <p>
+            <?php
+            if (is_metaconsole() === true) {
+                echo __('You cannot use this metaconsole until merging process is finished');
+            } else {
+                echo __('You cannot use this console until merging process is finished');
+            }
+            ?>
+        </p>
+        <br>
+        <br>
+
+        <?php
+        html_print_image(
+            'images/pandora_tinylogo.png',
+            false,
+            ['class' => 'responsive flex margn']
+        );
+        html_print_image(
+            'images/maintenance.png',
+            false,
+            [
+                'class' => 'responsive',
+                'width' => 800,
+            ]
+        );
+        ?>
+
+        <br>
+        <br>
+        <p><?php echo __('You will be automatically redirected when all tasks finish'); ?></p>
+    </div>
+</body>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        setTimeout(
+            function() {
+                location.reload();
+            },
+            10000
+        );
+    })
+</script>
+
+</html>
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@ -228,16 +228,15 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
        );

        $autorefresh_list = json_decode(
-            $select[0]['autorefresh_white_list']
+            (empty($select[0]['autorefresh_white_list']) === false)
+            ? $select[0]['autorefresh_white_list']
+            : ''
        );

        $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
            ) {
@ -367,59 +366,37 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
            $header_autorefresh_counter .= '</div>';
        }

-        // Button for feedback pandora.
-        if (enterprise_installed() && $config['activate_feedback']) {
-            $header_feedback = '<div id="feedback-icon-header">';
-            $header_feedback .= '<div id="modal-feedback-form" class="invisible"></div>';
-            $header_feedback .= '<div id="msg-header" class="invisible"></div>';
-            $header_feedback .= html_print_image(
-                'images/send_feedback@header.svg',
-                true,
-                [
-                    'class' => 'main_menu_icon invert_filter',
-                    'title' => __('Feedback'),
-                    'id'    => 'feedback-header',
-                    'alt'   => __('Feedback'),
-                    'style' => 'cursor: pointer;',
-                ]
-            );
-            $header_feedback .= '</div>';
-        }
-
-
-        // Support.
-        if (enterprise_installed()) {
-            $header_support_link = $config['custom_support_url'];
+        $modal_box = '<div id="modal_help" class="invisible">
+        <div id="modal-feedback-form" class="invisible"></div>
+        <div id="msg-header" class="invisible"></div>
+            <a href="https://pandorafms.com/manual" target="_blank">'.__('Pandora documentation').'</a>';
+        if (enterprise_installed() === true) {
+            $modal_box .= '<a href="https://support.pandorafms.com/" target="_blank">'.__('Enterprise support ').'</a>';
+            $modal_box .= '<a href="#" id="feedback-header">'.__('Give us feedback').'</a>';
        } else {
-            $header_support_link = 'https://pandorafms.com/forums/';
+            $modal_box .= '<a href="https://pandorafms.com/community/forums/" target="_blank">'.__('Community Support').'</a>';
        }

-        $header_support = '<div id="header_support">';
-        $header_support .= '<a href="'.ui_get_full_external_url($header_support_link).'" target="_blank">';
-        $header_support .= html_print_image(
-            'images/support@header.svg',
-            true,
-            [
-                'title' => __('Go to support'),
-                'class' => 'main_menu_icon bot invert_filter',
-                'alt'   => 'user',
-            ]
-        );
-        $header_support .= '</a></div>';
+        $modal_box .= '<hr class="separator" />';
+        $modal_box .= '<a href="https://github.com/pandorafms/pandorafms/issues" target="_blank">'.__('Open an issue in Github').'</a>';
+        $modal_box .= '<a href="https://discord.com/invite/xVt2ruSxmr" target="_blank">'.__('Join discord community').'</a>';
+        $modal_box .= '</div>';

-        // Documentation.
-        $header_docu = '<div id="header_docu">';
-        $header_docu .= '<a href="'.ui_get_full_external_url($config['custom_docs_url']).'" target="_blank">';
-        $header_docu .= html_print_image(
-            'images/documentation@header.svg',
-            true,
+        $modal_help = html_print_div(
            [
-                'title' => __('Go to documentation'),
-                'class' => 'main_menu_icon bot invert_filter',
-                'alt'   => 'user',
-            ]
+                'id'      => 'modal-help-content',
+                'content' => html_print_image(
+                    'images/help@header.svg',
+                    true,
+                    [
+                        'title' => __('Help'),
+                        'class' => 'main_menu_icon bot invert_filter',
+                        'alt'   => 'user',
+                    ]
+                ).$modal_box,
+            ],
+            true,
        );
-        $header_docu .= '</a></div>';


        // User.
@ -473,11 +450,11 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                echo '</span>';
            echo '</div>';
            echo '<div class="header_center"></div>';
-            echo '<div class="header_right">'.$header_support, $header_docu, $header_user, $header_logout.'</div>';
+            echo '<div class="header_right">'.$modal_help, $header_user, $header_logout.'</div>';
        } else {
            echo '<div class="header_left"><span class="header_title">'.$config['custom_title_header'].'</span><span class="header_subtitle">'.$config['custom_subtitle_header'].'</span></div>
            <div class="header_center">'.$header_searchbar.'</div>
-            <div class="header_right">'.$header_autorefresh, $header_autorefresh_counter, $header_discovery, $header_welcome, $servers_list, $header_feedback, $header_support, $header_docu, $header_user, $header_logout.'</div>';
+            <div class="header_right">'.$header_autorefresh, $header_autorefresh_counter, $header_discovery, $header_welcome, $servers_list, $modal_help, $header_user, $header_logout.'</div>';
        }
        ?>
    </div>    <!-- Closes #table_header_inner -->
@ -555,6 +532,54 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
        element.style.display = "none"
    }

+    function notifications_clean_all() {
+        let wrapper_inner = document.getElementById('notification-wrapper-inner');
+        while (wrapper_inner.firstChild) {
+            wrapper_inner.removeChild(wrapper_inner.firstChild);
+        }
+    }
+
+    function mark_all_notification_as_read() {
+        jQuery.post ("ajax.php",
+            {
+                "page" : "godmode/setup/setup_notifications",
+                "mark_all_notification_as_read" : 1
+            },
+            function (data, status) {
+                notifications_clean_all();
+                location.reload();
+            },
+            "json"
+        )
+        .fail(function(xhr, textStatus, errorThrown){
+            console.error(
+                "Failed to mark al notification as read. Error: ",
+                xhr.responseText
+            );
+        });
+    }
+
+    function filter_notification() {
+        let notification_type = '';
+        $('.notification-item').hide();
+        $(".checkbox_filter_notifications:checkbox:checked").each(function() {
+            notification_type = $(this).val();
+            console.log(notification_type);
+            $('.notification-item[value='+notification_type+']').show();
+            if (notification_type == 'All'){
+                $('.notification-item').show();
+            }
+        });
+
+        if (notification_type == 'All'){
+            $('.notification-item').show();
+        }
+
+        if (notification_type == ''){
+            $('.notification-item').hide();
+        }
+    }
+
    function click_on_notification_toast(event) {
        var match = /notification-(.*)-id-([0-9]+)/.exec(event.target.id);
        if (!match) {
@ -961,8 +986,6 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
        <?php if (enterprise_installed()) { ?>
            // Feedback.
            $("#feedback-header").click(function () {
-                // Clean DOM.
-                $("#feedback-header").empty();
                // Function charge Modal.
                show_feedback();
            });
@ -1068,6 +1091,22 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);

            return false;
        });
+
+
+        $(document).click(function(event) {
+            if (!$(event.target).closest('#modal-help-content').length &&
+                $('#modal_help').hasClass('invisible') === false) {
+                $('#modal_help').addClass('invisible');
+            }
+        });
+
+        $('#modal-help-content').on('click', (e) => {
+            if($(e.target).prop('tagName') === 'A') {
+                $('#modal_help').addClass('invisible');
+            } else {
+                $('#modal_help').removeClass('invisible');
+            }
+        });
    });
 /* ]]> */
 </script>
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@ -30,7 +30,7 @@ require_once __DIR__.'/../include/functions_html.php';
 echo '<style>
        :root {';
 if ($config['style'] === 'pandora') {
-    echo '--login-background-color: rgba(255, 255, 255, 0.4);';
+    echo '--login-background-color: rgba(255, 255, 255, 0.50);';
    echo '--login-label-color: #545454;';
    echo '--login-text-color: #000;';
    $style_theme = 'white-theme';
@ -237,16 +237,18 @@ if (is_metaconsole() === true) {
        );
    }
 } else if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+    $theme_logo = ($config['style'] === 'pandora') ? 'images/custom_logo_login/Pandora FMS alt black.png' : 'enterprise/images/custom_logo_login/'.$config['custom_logo_login'];
    if (!isset($config['custom_logo_login'])) {
-        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
    } else {
-        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/'.$config['custom_logo_login']), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
    }
 } else {
+    $theme_logo = ($config['style'] === 'pandora') ? 'images/custom_logo_login/Pandora FMS alt black.png' : 'images/custom_logo_login/'.$config['custom_logo_login'];
    if (empty($config['custom_logo_login']) === true) {
-        html_print_image(ui_get_full_url('images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
    } else {
-        html_print_image(ui_get_full_url('images/custom_logo_login/').$config['custom_logo_login'], false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
    }
 }

--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@ -259,6 +259,8 @@ if (!empty($news)) {

            $output_news .= '</div></div>';
        } else {
+            $text = str_replace('<script', '&lt;script', $text);
+            $text = str_replace('</script', '&lt;/script', $text);
            $output_news .= nl2br($text);
        }

--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@ -185,6 +185,10 @@ echo '</div>';
                    $(`#sub${this.id}`).hide();
                })
            } else if ($('#menu_full').hasClass('menu_full_collapsed')) {
+                $(".arrow_menu_right").each(function() {
+                    $(this).removeClass('arrow_menu_right');
+                    $(this).addClass('arrow_menu_down');
+                });
                localStorage.setItem("menuType", "classic");
                $('ul.submenu').css('left', '280px');
                var menuType_val = localStorage.getItem("menuType");
@ -273,6 +277,14 @@ echo '</div>';
        $('.menu_icon').mouseenter(function() {
            var menuType_val = localStorage.getItem("menuType");
            if (!click_display && menuType_val === 'collapsed') {
+                $(".arrow_menu_down").each(function() {
+                    $(this).removeClass('arrow_menu_down');
+                    $(this).addClass('arrow_menu_right');
+                });
+                $(".arrow_menu_up").each(function() {
+                    $(this).removeClass('arrow_menu_up');
+                    $(this).addClass('arrow_menu_right');
+                });
                table_hover = $(this);
                handsIn = 1;
                openTime = new Date().getTime();
@ -305,6 +317,7 @@ echo '</div>';
                table_hover2 = $(this);
                handsIn2 = 1;
                openTime2 = new Date().getTime();
+                $("#sub" + table_hover2[0].id).attr('style', 'display: none; position: fixed; left: 340px;');
                $("#sub" + table_hover2[0].id).show();
                if (typeof(table_noHover2) != 'undefined') {
                    if ("ul#sub" + table_hover2[0].id != "ul#sub" + table_noHover2[0].id) {
@ -315,6 +328,7 @@ echo '</div>';
        }).mouseleave(function() {
            var menuType_val = localStorage.getItem("menuType");
            if (!click_display && menuType_val === 'collapsed') {
+                $("#sub" + $(this)[0].id).attr('style', 'display: none;');
                table_noHover2 = table_hover2;
                handsIn2 = 0;
                setTimeout(function() {
@ -474,4 +488,10 @@ echo '</div>';
            return height_logo + height_tabs + padding_menu + height_position;
        }
    });
+
+    <?php
+    if (get_user_language($config['id_user']) == 'es') {
+        ?>
+    $('#icon_god-extensions').find('span').attr('style', 'white-space: nowrap;');
+    <?php } ?>
 </script>
--- 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)
 );

@ -931,7 +931,7 @@ foreach ($fields as $field) {
    // Filling the data.
    $combo = [];
    $combo = $field['combo_values'];
-    $combo = explode(',', $combo);
+    $combo = explode(',', (empty($combo) === true) ? '' : $combo);
    $combo_values = [];
    foreach ($combo as $value) {
        $combo_values[$value] = $value;
@ -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");
            }
        });
        
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@ -1758,7 +1758,10 @@ if ($update_module) {
    ];


-    if ($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33) {
+    if ($id_module_type === 30 || $id_module_type === 31
+        || $id_module_type === 32 || $id_module_type === 33
+        || $id_module_type === 38
+    ) {
        $plugin_parameter_split = explode('&#x0a;', $values['plugin_parameter']);

        $values['plugin_parameter'] = '';
@ -1954,7 +1957,10 @@ if ($create_module) {
        'warning_time'          => $warning_time,
    ];

-    if ($id_module_type === 30 || $id_module_type === 31 || $id_module_type === 32 || $id_module_type === 33) {
+    if ($id_module_type === 30 || $id_module_type === 31
+        || $id_module_type === 32 || $id_module_type === 33
+        || $id_module_type === 38
+    ) {
        $plugin_parameter_split = explode('&#x0a;', $values['plugin_parameter']);

        $values['plugin_parameter'] = '';
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@ -996,6 +996,8 @@ if ($agents !== false) {
        $tableAgents->data[$key][6] = $actionButtonsColumn;
    }

+    $total_items = '<div class="total_pages">'.sprintf(__('Total items: %s'), $total_agents).'</div>';
+    echo $total_items;
    html_print_table($tableAgents);

    $tablePagination = ui_pagination(
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@ -407,8 +407,7 @@ if ($edit_module === true) {
        $help_header = 'local_module';
    }

-    if ($id_module_type === 6 || $id_module_type === 7
-    ) {
+    if ($id_module_type === 6 || $id_module_type === 7) {
        $help_header = 'icmp_module_tab';
    }

@ -420,7 +419,7 @@ if ($edit_module === true) {
        $help_header = 'tcp_module_tab';
    }

-    if ($id_module_type >= 30 && $id_module_type <= 33) {
+    if (($id_module_type >= 30 && $id_module_type <= 33) || $id_module_type === 38) {
        $help_header = 'webserver_module_tab';
    }
 }
@ -1847,6 +1846,22 @@ $(document).ready (function () {
        setModuleType(type_name_selected);
    });

+    $('#checkbox-warning_inverse_string').change( function () {
+        if ($(this).prop('checked') === true) {
+            $('input[name="warning_thresholds_checks"]').val('warning_inverse');
+        } else {
+            $('input[name="warning_thresholds_checks"]').val('normal_warning');
+        }
+    });
+
+    $('#checkbox-critical_inverse_string').change( function () {
+        if ($(this).prop('checked') === true) {
+            $('input[name="critical_thresholds_checks"]').val('critical_inverse');
+        } else {
+            $('input[name="critical_thresholds_checks"]').val('normal_critical');
+        }
+    });
+
    function setModuleType(type_name_selected) {
        if (type_name_selected.match(/_string$/) == null) {
            // Hide string fields.
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@ -233,7 +233,6 @@ if ($adopt === false) {
 }

 $snmp_versions['1'] = 'v. 1';
-$snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
 $snmp_versions['3'] = 'v. 3';

--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@ -171,6 +171,8 @@ foreach ($password_fields as $k => $p) {
    }

    $(document).ready(function () {
-        changePluginSelect();
+        if ($("#id_plugin").val() === 0) {
+            changePluginSelect();
+        }
    });
 </script>
--- 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',
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@ -725,17 +725,17 @@ if ($copy_command) {
 $is_management_allowed = is_management_allowed();
 if ($is_management_allowed === false) {
    if (is_metaconsole() === false) {
-        $url = '<a target="_blank" href="'.ui_get_meta_url(
+        $url_redirect = '<a target="_blank" href="'.ui_get_meta_url(
            'index.php?sec=advanced&sec2=godmode/alerts/alert_commands&tab=command&pure=0'
        ).'">'.__('metaconsole').'</a>';
    } else {
-        $url = __('any node');
+        $url_redirect = __('any node');
    }

    ui_print_warning_message(
        __(
            'This node is configured with centralized mode. All alert commands information is read only. Go to %s to manage it.',
-            $url
+            $url_redirect
        )
    );
 }
@ -807,12 +807,12 @@ foreach ($commands as $command) {
    // (IMPORTANT, DO NOT CHANGE!) only users with permissions over "All" group have access to edition of commands belonging to "All" group.
    if ($is_management_allowed === true && !$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'LM')) {
        if (is_user_admin($config['id_user']) === true) {
-                    $data['action'] = '<span class="inline_flex">';
+            $data['action'] = '<span class="inline_flex">';
            $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'&offset='.$offset.'"
-            onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
+            onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.svg', true, ['class' => 'main_menu_icon invert_filter ', 'title' => 'Duplicate']).'</a>';

            $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'&pure='.$pure.'&offset='.$offset_delete.'"
-			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
+			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter', 'title' => 'Delete']).'</a>';
            $data['action'] .= '</span>';
        }
    }
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@ -912,7 +912,10 @@ foreach ($simple_alerts as $alert) {
            1,
            'padding:0px; width: 22px; height: 22px;',
            true,
-            ['class' => 'invert_filter main_menu_icon']
+            [
+                'class' => 'invert_filter main_menu_icon',
+                'title' => __('Enable'),
+            ]
        );
        $data[4] .= html_print_input_hidden('enable_alert', 1, true);
    } else {
@ -922,7 +925,10 @@ foreach ($simple_alerts as $alert) {
            1,
            'padding:0px; width: 22px; height: 22px;',
            true,
-            ['class' => 'main_menu_icon']
+            [
+                'class' => 'invert filter main_menu_icon',
+                'title' => __('Disable'),
+            ]
        );
        $data[4] .= html_print_input_hidden('disable_alert', 1, true);
    }
@ -940,7 +946,10 @@ foreach ($simple_alerts as $alert) {
                1,
                'padding:0px; width: 22px; height: 22px;',
                true,
-                ['class' => 'invert_filter main_menu_icon']
+                [
+                    'class' => 'invert_filter main_menu_icon',
+                    'title' => __('Standby off'),
+                ]
            );
            $data[4] .= html_print_input_hidden('standbyon_alert', 1, true);
        } else {
@ -950,7 +959,10 @@ foreach ($simple_alerts as $alert) {
                1,
                'padding:0px; width: 22px; height: 22px;',
                true,
-                ['class' => 'invert_filter main_menu_icon']
+                [
+                    'class' => 'invert_filter main_menu_icon',
+                    'title' => __('Standby on'),
+                ]
            );
            $data[4] .= html_print_input_hidden('standbyoff_alert', 1, true);
        }
@ -1139,8 +1151,7 @@ if (! $id_agente) {
        return false;
    });
    
-    $("input[name=disable]").attr ("title", "<?php echo __('Disable'); ?>")
-        .hover (function () {
+    $("input[name=disable]").hover (function () {
                $(this).attr ("src", 
                <?php
                echo '"'.html_print_image(
@ -1166,8 +1177,7 @@ if (! $id_agente) {
            }
        );
    
-    $("input[name=enable]").attr ("title", "<?php echo __('Enable'); ?>")
-        .hover (function () {
+    $("input[name=enable]").hover (function () {
                $(this).attr ("src", 
                <?php
                echo '"'.html_print_image(
@ -1193,8 +1203,7 @@ if (! $id_agente) {
            }
        );
    
-    $("input[name=standby_on]").attr ("title", "<?php echo __('Set off standby'); ?>")
-        .hover (function () {
+    $("input[name=standby_on]").hover (function () {
                $(this).attr ("src", 
                <?php
                echo '"'.html_print_image(
@ -1220,8 +1229,7 @@ if (! $id_agente) {
            }
        );
    
-    $("input[name=standby_off]").attr ("title", "<?php echo __('Set standby'); ?>")
-        .hover (function () {
+    $("input[name=standby_off]").hover (function () {
                $(this).attr ("src", 
                <?php
                echo '"'.html_print_image(
--- a/pandora_console/godmode/alerts/alert_view.php
+++ b/pandora_console/godmode/alerts/alert_view.php
@ -262,7 +262,7 @@ $data[1] = '';
 $table_conditions->data[] = $data;

 $data[0] = __('Use special days list');
-$data[1] = (isset($alert['special_day']) && $alert['special_day'] == 1) ? __('Yes') : __('No');
+$data[1] = (isset($template['special_day']) && (int) $template['special_day'] !== 0) ? __('Yes') : __('No');
 $table_conditions->data[] = $data;

 $data[0] = __('Time threshold');
@ -678,6 +678,23 @@ ui_require_javascript_file('pandora_fullcalendar');

 <script language="javascript" type="text/javascript">
 $(document).ready (function () {
+    $('li#icon_oper-agents').addClass('selected');
+    $('ul#subicon_oper-agents').show();
+    $('#title_menu').children().last().removeClass('arrow_menu_down');
+    $('#title_menu').children().last().addClass('arrow_menu_up');
+    $('#title_menu').children().first().next().addClass('span_selected');
+    $('li#Views').show();
+    $('li#Views').children().first().children().last().removeClass('arrow_menu_down');
+    $('li#Views').children().first().children().last().addClass('arrow_menu_up');
+    $('li#Views').children().first().children().first().addClass('span_selected');
+    $('li#Views').addClass('submenu_selected');
+    $('li#Views').removeClass('submenu_not_selected');
+    $('ul#subViews').show();
+    var parent = $('div[title="Alert details"]').parent().parent();
+    parent.addClass('selected');
+    $('.sub_subMenu.selected').prepend(`<div class="element_submenu_selected left_3"></div>`);
+
+
    var calendarEl = document.getElementById('calendar_map');
    if(calendarEl){
        var eventsBBDD = $("#hidden-schedule").val();
--- 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'),
--- 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,
--- a/pandora_console/godmode/massive/massive_add_profiles.php
+++ b/pandora_console/godmode/massive/massive_add_profiles.php
@ -103,6 +103,7 @@ if ($create_profiles) {
    $groups_id = get_parameter('groups_id', -1);
    $users_id = get_parameter('users_id', -1);
    $n_added = 0;
+    $msg_error = __('Profiles cannot be added');

    if ($profiles_id == -1 || $groups_id == -1 || $users_id == -1) {
        $result = false;
@ -155,6 +156,8 @@ if ($create_profiles) {
                        if ($return !== false) {
                            $n_added++;
                        }
+                    } else {
+                        $msg_error = __('The profile already exist on the user');
                    }
                }
            }
@ -182,7 +185,7 @@ if ($create_profiles) {
    ui_print_result_message(
        $n_added > 0,
        __('Profiles added successfully').'('.$n_added.')',
-        __('Profiles cannot be added')
+        $msg_error
    );
 }

--- 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>';
--- a/pandora_console/godmode/massive/massive_delete_profiles.php
+++ b/pandora_console/godmode/massive/massive_delete_profiles.php
@ -67,8 +67,27 @@ if (is_ajax()) {
    if ($get_users) {
        $id_group = get_parameter('id_group');
        $id_profile = get_parameter('id_profile');
+        $get_all_groups = get_parameter('get_all_groups', '0');
+
+        if ($get_all_groups !== '0') {
+            $profile_data = db_get_all_rows_sql(
+                'SELECT *
+                    FROM tusuario_perfil
+                    WHERE `id_perfil` = "'.$id_profile[0].'"
+                    GROUP BY id_usuario'
+            );
+        } else {
+            if (strlen($id_profile[0]) > 0 && strlen($id_group[0]) > 0) {
+                $profile_data = db_get_all_rows_filter(
+                    'tusuario_perfil',
+                    [
+                        'id_perfil' => $id_profile[0],
+                        'id_grupo'  => $id_group[0],
+                    ]
+                );
+            }
+        }

-        $profile_data = db_get_all_rows_filter('tusuario_perfil', ['id_perfil' => $id_profile[0], 'id_grupo' => $id_group[0]]);
        if (!users_is_admin()) {
            foreach ($profile_data as $user => $values) {
                if (users_is_admin($values['id_usuario'])) {
@ -243,6 +262,21 @@ $data[2] .= html_print_select(
 );

 array_push($table->data, $data);
+$table->data[1][0] = '';
+$table->data[1][1] = html_print_label_input_block(
+    __('Show all groups'),
+    html_print_checkbox_switch(
+        'get_all_groups',
+        1,
+        $get_all_groups,
+        true,
+        false,
+        '',
+        false,
+        ' float-right'
+    ),
+    ['div_class' => 'center_align']
+);

 html_print_table($table);

@ -273,7 +307,8 @@ $(document).ready (function () {
            {"page" : "godmode/massive/massive_delete_profiles",
            "get_users" : 1,
            "id_group[]" : $("#groups_id").val(),
-            "id_profile[]" : $("#profiles_id").val()
+            "id_profile[]" : $("#profiles_id").val(),
+            "get_all_groups" : $('#checkbox-get_all_groups').is(':checked') ? 1 : 0
            },
            function (data, status) {
                options = "";
@ -295,6 +330,10 @@ $(document).ready (function () {
    $("#profiles_id").change (function () {
        update_users();
    });
+
+    $("#checkbox-get_all_groups").change (function () {
+        update_users();
+    });
 });
 /* ]]> */
 </script>
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@ -965,7 +965,6 @@ $table->data[19][0] = html_print_label_input_block(
 );

 $snmp_versions['1'] = 'v. 1';
-$snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
 $snmp_versions['3'] = 'v. 3';

--- 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 (legacy)');
+                $sub2['godmode/servers/discovery&wiz=app&mode=mysql']['text'] = __('Mysql (legacy)');
+                $sub2['godmode/servers/discovery&wiz=app&mode=oracle']['text'] = __('Oracle (legacy)');
+                $sub2['godmode/servers/discovery&wiz=app&mode=vmware']['text'] = __('VMware (legacy)');
+                $sub2['godmode/servers/discovery&wiz=app&mode=SAP']['text'] = __('SAP (legacy)');
+                $sub2['godmode/servers/discovery&wiz=app&mode=DB2']['text'] = __('DB2 (legacy)');
+            }

-        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 (legacy)');
+                $sub2['godmode/servers/discovery&wiz=cloud&mode=azure']['text'] = __('Microsoft Azure (legacy)');
+                $sub2['godmode/servers/discovery&wiz=cloud&mode=gcp']['text'] = __('Google Compute Platform (legacy)');
+            }
+
+
+            $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;
--- a/pandora_console/godmode/modules/manage_network_components_form_network.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_network.php
@ -45,7 +45,6 @@ if (!$id && !isset($snmp_community)) {
 }

 $snmp_versions['1'] = 'v. 1';
-$snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
 $snmp_versions['3'] = 'v. 3';

--- a/pandora_console/godmode/netflow/nf_edit_form.php
+++ b/pandora_console/godmode/netflow/nf_edit_form.php
@ -261,8 +261,8 @@ $table->data['first_line'][] = html_print_label_input_block(
        'assign_group',
        $assign_group,
        '',
-        '',
-        -1,
+        __('All'),
+        0,
        true,
        false,
        false,
--- a/pandora_console/godmode/reporting/graph_builder.main.php
+++ b/pandora_console/godmode/reporting/graph_builder.main.php
@ -190,14 +190,21 @@ $output .= html_print_label_input_block(
    html_print_extended_select_for_time(
        'period',
        $period,
-        '',
+        'check_period_warning(this, \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')',
        '',
        '0',
        false,
        true,
        false,
        false,
-        'w100p'
+        'w100p',
+        false,
+        false,
+        '',
+        false,
+        0,
+        null,
+        'check_period_warning_manual(\'period\', \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')'
    )
 );
 $output .= "</td><td class='datos2' width='50%'>";
--- 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>';
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@ -1421,10 +1421,21 @@ $class = 'databox filters';
                html_print_extended_select_for_time(
                    'period',
                    $period,
-                    '',
+                    'check_period_warning(this, \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')',
                    '',
                    '0',
-                    10
+                    10,
+                    false,
+                    false,
+                    true,
+                    '',
+                    false,
+                    false,
+                    '',
+                    false,
+                    0,
+                    null,
+                    'check_period_warning_manual(\'period\', \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')'
                );
                ?>
            </td>
@ -1444,10 +1455,21 @@ $class = 'databox filters';
                html_print_extended_select_for_time(
                    'period_range',
                    $period_range,
-                    '',
+                    'check_period_warning(this, \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')',
                    '',
                    '0',
-                    10
+                    10,
+                    false,
+                    false,
+                    true,
+                    '',
+                    false,
+                    false,
+                    '',
+                    false,
+                    0,
+                    null,
+                    'check_period_warning_manual(\'period_range\', \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')'
                );
                ?>
            </td>
@ -1487,10 +1509,21 @@ $class = 'databox filters';
                html_print_extended_select_for_time(
                    'period1',
                    $period_pg,
-                    '',
+                    'check_period_warning(this)',
                    '',
                    '0',
-                    10
+                    10,
+                    false,
+                    false,
+                    true,
+                    '',
+                    false,
+                    false,
+                    '',
+                    false,
+                    0,
+                    null,
+                    'check_period_warning_manual(\'period\')'
                );
                ?>
            </td>
@ -1506,10 +1539,21 @@ $class = 'databox filters';
                html_print_extended_select_for_time(
                    'period2',
                    $projection_period,
-                    '',
+                    'check_period_warning(this)',
                    '',
                    '0',
-                    10
+                    10,
+                    false,
+                    false,
+                    true,
+                    '',
+                    false,
+                    false,
+                    '',
+                    false,
+                    0,
+                    null,
+                    'check_period_warning_manual(\'period\')'
                );
                ?>
            </td>
@ -3440,7 +3484,7 @@ $class = 'databox filters';
                html_print_extended_select_for_time(
                    'lapse',
                    $lapse,
-                    '',
+                    'check_period_warning(this, \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')',
                    __('None'),
                    '0',
                    10,
@ -3448,7 +3492,13 @@ $class = 'databox filters';
                    '',
                    '',
                    '',
-                    !$lapse_calc
+                    !$lapse_calc,
+                    false,
+                    '',
+                    false,
+                    0,
+                    null,
+                    'check_period_warning_manual(\'lapse\', \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')'
                );
                ?>
            </td>
@ -6720,6 +6770,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':
--- 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,24 @@ 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 && $report_task_data !== -1)) {
+            $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 {
+            if ($report_task_data === -1) {
+                $report_task_data = '';
+            }
+
+            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')
        ) {
@ -3860,7 +3886,7 @@ if ($resultOperationDB !== null) {
        break;

        case 'SLA':
-            $err .= 'You must enter some character in SLA limit field';
+            $err .= 'No changes found.';
        default:
            $err .= '';
        break;
@ -3869,7 +3895,7 @@ if ($resultOperationDB !== null) {
    ui_print_result_message(
        $resultOperationDB,
        __('Successfull action'),
-        __('Unsuccessful action<br><br>'.$err)
+        __($err)
    );
 }

--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@ -182,7 +182,7 @@ if ($layoutDatas === false) {
 $alternativeStyle = true;

 $parents = visual_map_get_items_parents($idVisualConsole);
-
+$x = 0;
 foreach ($layoutDatas as $layoutData) {
    $idLayoutData = $layoutData['id'];

@ -537,7 +537,8 @@ foreach ($layoutDatas as $layoutData) {

    $table->data[($i + 1)][5] = '';
    $table->data[($i + 1)][5] .= html_print_checkbox('multiple_delete_items', $idLayoutData, false, true);
-    $table->data[($i + 1)][5] .= '<a href="'.$url_delete.'" '.'onclick="javascript: if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
+    $table->data[($i + 1)][5] .= '<a href="'.$url_delete.'"onclick="javascript: if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
+    $table->data[($i + 1)][5] .= html_print_input_hidden('updated_'.$idLayoutData, '0', true);

    // Second row
    $table->data[($i + 2)]['icon'] = '';
@ -778,6 +779,12 @@ foreach ($layoutDatas as $layoutData) {
    $alternativeStyle = !$alternativeStyle;

    $i = ($i + 3);
+    $x++;
+}
+
+$x = (($x * 13) + 14);
+if ($x > ini_get('max_input_vars')) {
+    ui_print_warning_message(__('You have to change the <b>"max_input_vars"</b> and set bigger value on <b>php.ini</b> for update, there is too much elements to update'));
 }

 $pure = get_parameter('pure', 0);
@ -888,6 +895,16 @@ ui_require_javascript_file('tinymce', 'vendor/tinymce/tinymce/');
            return false;
        });

+        $('select[id^="image_"], input[name^="width_"], input[name^="height"], input[name^="left_"], input[name^="top_"], select[id^="parent_"], input[id^="agent_"], select[id^="module_"]').change(function(){
+            var id = $(this).attr('id').split('_')[1];
+            $('#hidden-updated_'+id).val('1');
+        });
+
+        $('select[id^="map_linked"]').change(function(){
+            var id = $(this).attr('id').split('_')[2];
+            $('#hidden-updated_'+id).val('1');
+        });
+
        defineTinyMCE('#tinyMCE_editor');

        $("#dialog_label_editor").hide ()
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@ -418,7 +418,6 @@ switch ($activeTab) {
            case 'update':
                // Update background
                $background = get_parameter('background');
-                $background_color = get_parameter('background_color');
                $width = get_parameter('width');
                $height = get_parameter('height');

@ -433,10 +432,9 @@ switch ($activeTab) {
                db_process_sql_update(
                    'tlayout',
                    [
-                        'background'       => $background,
-                        'background_color' => $background_color,
-                        'width'            => $width,
-                        'height'           => $height,
+                        'background' => $background,
+                        'width'      => $width,
+                        'height'     => $height,
                    ],
                    ['id' => $idVisualConsole]
                );
@ -463,62 +461,65 @@ switch ($activeTab) {

                foreach ($idsElements as $idElement) {
                    $id = $idElement['id'];
-                    $values = [];
-                    $values['label'] = get_parameter('label_'.$id, '');
-                    $values['image'] = get_parameter('image_'.$id, '');
-                    $values['width'] = get_parameter('width_'.$id, 0);
-                    $values['height'] = get_parameter('height_'.$id, 0);
-                    $values['pos_x'] = get_parameter('left_'.$id, 0);
-                    $values['pos_y'] = get_parameter('top_'.$id, 0);
-                    switch ($idElement['type']) {
-                        case NETWORK_LINK:
-                        case LINE_ITEM:
-                        continue 2;
+                    $update = get_parameter('updated_'.$id, 0);
+                    if ($update === '1') {
+                        $values = [];
+                        $values['label'] = get_parameter('label_'.$id, '');
+                        $values['image'] = get_parameter('image_'.$id, '');
+                        $values['width'] = get_parameter('width_'.$id, 0);
+                        $values['height'] = get_parameter('height_'.$id, 0);
+                        $values['pos_x'] = get_parameter('left_'.$id, 0);
+                        $values['pos_y'] = get_parameter('top_'.$id, 0);
+                        switch ($idElement['type']) {
+                            case NETWORK_LINK:
+                            case LINE_ITEM:
+                            continue 2;

-                        break;
+                            break;

-                        case SIMPLE_VALUE_MAX:
-                        case SIMPLE_VALUE_MIN:
-                        case SIMPLE_VALUE_AVG:
-                            $values['period'] = get_parameter('period_'.$id, 0);
-                        break;
+                            case SIMPLE_VALUE_MAX:
+                            case SIMPLE_VALUE_MIN:
+                            case SIMPLE_VALUE_AVG:
+                                $values['period'] = get_parameter('period_'.$id, 0);
+                            break;

-                        case MODULE_GRAPH:
-                            $values['period'] = get_parameter('period_'.$id, 0);
-                            unset($values['image']);
-                        break;
+                            case MODULE_GRAPH:
+                                $values['period'] = get_parameter('period_'.$id, 0);
+                                unset($values['image']);
+                            break;

-                        case GROUP_ITEM:
-                            $values['id_group'] = get_parameter('group_'.$id, 0);
-                        break;
+                            case GROUP_ITEM:
+                                $values['id_group'] = get_parameter('group_'.$id, 0);
+                            break;

-                        case CIRCULAR_PROGRESS_BAR:
-                        case CIRCULAR_INTERIOR_PROGRESS_BAR:
-                        case PERCENTILE_BUBBLE:
-                        case PERCENTILE_BAR:
-                            unset($values['height']);
-                        break;
+                            case CIRCULAR_PROGRESS_BAR:
+                            case CIRCULAR_INTERIOR_PROGRESS_BAR:
+                            case PERCENTILE_BUBBLE:
+                            case PERCENTILE_BAR:
+                                unset($values['height']);
+                            break;
+                        }
+
+                        $agentName = get_parameter('agent_'.$id, '');
+                        if (defined('METACONSOLE')) {
+                            $values['id_metaconsole'] = (int) get_parameter('id_server_id_'.$id, '');
+                            $values['id_agent'] = (int) get_parameter('id_agent_'.$id, 0);
+                        } else {
+                            $agent_id = (int) get_parameter('id_agent_'.$id, 0);
+                            $values['id_agent'] = $agent_id;
+                        }
+
+                        $values['id_agente_modulo'] = get_parameter('module_'.$id, 0);
+                        $values['id_custom_graph'] = get_parameter('custom_graph_'.$id, 0);
+                        $values['parent_item'] = get_parameter('parent_'.$id, 0);
+                        $values['id_layout_linked'] = get_parameter('map_linked_'.$id, 0);
+
+                        if (enterprise_installed()) {
+                            enterprise_visual_map_update_action_from_list_elements($type, $values, $id);
+                        }
+
+                        db_process_sql_update('tlayout_data', $values, ['id' => $id]);
                    }
-
-                    $agentName = get_parameter('agent_'.$id, '');
-                    if (defined('METACONSOLE')) {
-                        $values['id_metaconsole'] = (int) get_parameter('id_server_id_'.$id, '');
-                        $values['id_agent'] = (int) get_parameter('id_agent_'.$id, 0);
-                    } else {
-                        $agent_id = (int) get_parameter('id_agent_'.$id, 0);
-                        $values['id_agent'] = $agent_id;
-                    }
-
-                    $values['id_agente_modulo'] = get_parameter('module_'.$id, 0);
-                    $values['id_custom_graph'] = get_parameter('custom_graph_'.$id, 0);
-                    $values['parent_item'] = get_parameter('parent_'.$id, 0);
-                    $values['id_layout_linked'] = get_parameter('map_linked_'.$id, 0);
-
-                    if (enterprise_installed()) {
-                        enterprise_visual_map_update_action_from_list_elements($type, $values, $id);
-                    }
-
-                    db_process_sql_update('tlayout_data', $values, ['id' => $id]);
                }
            break;

@ -554,6 +555,7 @@ switch ($activeTab) {
                $type = (int) get_parameter('type', STATIC_GRAPH);
                $image = get_parameter('image');
                $range = (int) get_parameter('range', 50);
+                $range_vertical = (int) get_parameter('range_vertical', 50);
                $width = (int) get_parameter('width', 0);
                $height = (int) get_parameter('height', 0);
                $period = (int) get_parameter('period', 0);
@ -566,6 +568,9 @@ switch ($activeTab) {
                $label_type = get_parameter('label_type', 'agent_module');
                $enable_link = get_parameter('enable_link', 'enable_link');
                $show_on_top = get_parameter('show_on_top', 0);
+                $pos_x = get_parameter('pos_x', 0);
+                $pos_y = get_parameter('pos_y', 0);
+                $max_elements_row = (int) get_parameter('max_elements_row', 0);

                // This var switch between creation of items, item_per_agent = 0 => item per module; item_per_agent <> 0  => item per agent
                $item_per_agent = get_parameter('item_per_agent', 0);
@ -610,6 +615,7 @@ switch ($activeTab) {
                        $image,
                        $idVisualConsole,
                        $range,
+                        $range_vertical,
                        $width,
                        $height,
                        $period,
@ -625,7 +631,10 @@ switch ($activeTab) {
                        $kind_relationship,
                        $item_in_the_map,
                        $fontf,
-                        $fonts
+                        $fonts,
+                        $pos_x,
+                        $pos_y,
+                        $max_elements_row
                    );

                    $statusProcessInDB = [
@ -667,6 +676,7 @@ switch ($activeTab) {
                                $image,
                                $idVisualConsole,
                                $range,
+                                $range_vertical,
                                $width,
                                $height,
                                $period,
@ -682,7 +692,10 @@ switch ($activeTab) {
                                $kind_relationship,
                                $item_in_the_map,
                                $fontf,
-                                $fonts
+                                $fonts,
+                                $pos_x,
+                                $pos_y,
+                                $max_elements_row
                            );
                        } else {
                            $id_modules = [];
@ -721,6 +734,7 @@ switch ($activeTab) {
                                $image,
                                $idVisualConsole,
                                $range,
+                                $range_vertical,
                                $width,
                                $height,
                                $period,
@ -736,7 +750,10 @@ switch ($activeTab) {
                                $kind_relationship,
                                $item_in_the_map,
                                $fontf,
-                                $fonts
+                                $fonts,
+                                $pos_x,
+                                $pos_y,
+                                $max_elements_row
                            );
                        }
                    }
@ -837,12 +854,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,
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@ -144,22 +144,28 @@ $table->data['all_0'][0] = html_print_label_input_block(


 $table->rowstyle['staticgraph'] = 'display: none;';
+$table->colspan['staticgraph'][0] = 2;
 $table->data['staticgraph'][0] = html_print_label_input_block(
    __('Image'),
-    html_print_select(
+    '<div class="flex">'.html_print_select(
        $images_list,
        'image',
        '',
        '',
        '',
        '',
-        true
-    )
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 49%'
+    ).'<span id="image_prev" class="mrgn_lft_10px mrgn_top-10px"><img src="'.$config['homeurl'].'/images/console/icons/appliance_ok.png"></span></div>'
 );

 $table->rowstyle['all_1'] = 'display: none;';
 $table->data['all_1'][0] = html_print_label_input_block(
-    __('Range between elements (px)'),
+    __('Horizontal range between elements (px)'),
    html_print_input_text(
        'range',
        50,
@ -170,6 +176,18 @@ $table->data['all_1'][0] = html_print_label_input_block(
    )
 );

+$table->data['all_1'][1] = html_print_label_input_block(
+    __('Vertical range between elements (px)'),
+    html_print_input_text(
+        'range_vertical',
+        50,
+        '',
+        5,
+        5,
+        true
+    )
+);
+
 $input_size = __('Width').': ';
 $input_size .= html_print_input_text('width', 0, '', 5, 5, true);
 $input_size .= __('Height').': ';
@ -425,6 +443,16 @@ if (is_metaconsole() === false) {
    );
 }

+$table->data['all_4_01'][0] = html_print_label_input_block(
+    __('Filter agents'),
+    html_print_input_text('filter_agents', '', '', false, 255, true)
+);
+
+$table->data['all_4_01'][1] = html_print_label_input_block(
+    __('Filter modules'),
+    html_print_input_text('filter_modules', '', '', false, 255, true)
+);
+
 $table->rowstyle['all_4'] = 'display: none;';
 $table->data['all_4'][0] = html_print_label_input_block(
    __('Agents').ui_print_help_tip(
@ -549,6 +577,16 @@ $table->data['all_8'][1] = html_print_label_input_block(
    ).'</span>'
 );

+$table->data['all_10'][0] = html_print_label_input_block(
+    __('Max. elements for row'),
+    html_print_input_text('max_elements_row', 0, '', false, 255, true)
+);
+
+$table->data['all_10'][1] = html_print_label_input_block(
+    __('Position'),
+    '<div class="flex_center"><span class="mrgn_right_10px">X</span>'.html_print_input_text('pos_x', 0, '', false, 255, true, false, false, '', 'w50p').'<span class="margin-lr-10">Y</span>'.html_print_input_text('pos_y', 0, '', false, 255, true, false, false, '', 'w50p').'</div>'
+);
+
 if (is_metaconsole() === true) {
    $pure = get_parameter('pure', 0);

@ -831,6 +869,44 @@ function item_per_agent_change(itemPerAgent) {
 function metaconsole_init() {
    $("#groups").change();
 }
+
+$('#text-filter_agents').on('keyup',function(){
+    if ($(this).val() !== ''){
+        findInSelect('id_agents',$(this).val());
+    } else {
+        $('#id_agents option').each(function(){
+            $(this).removeClass('invisible');
+        });
+    }
+});
+
+$('#text-filter_modules').on('keyup',function(){
+    if ($(this).val() !== ''){
+        findInSelect('module',$(this).val());
+    } else {
+        $('#module option').each(function(){
+            $(this).removeClass('invisible');
+        });
+    }
+});
+
+function findInSelect(selectid, find){
+    var select = $('#'+selectid+' option');
+    select.each(function(){
+        var regex = new RegExp(find, "gi");
+        if ($(this).html().match(regex) === null) {
+            $(this).addClass('invisible');
+        } else {
+            $(this).removeClass('invisible');
+        }
+    })
+}
+
+$('#image').on('change', function(){
+    var img = $(this).val();
+    $('#image_prev').html('<img src="<?php echo $config['homeurl']; ?>/images/console/icons/'+img+'.png">');
+})
+
 </script>
 <style type="text/css">
    select[name='kind_relationship'] option[disabled='disabled'] {
--- a/pandora_console/godmode/servers/discovery.php
+++ b/pandora_console/godmode/servers/discovery.php
@ -24,6 +24,14 @@ if (! check_acl($config['id_user'], 0, 'AR')

 ui_require_css_file('discovery');

+ui_require_javascript_file('pandora_alerts');
+ui_include_time_picker();
+ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
+ui_require_javascript_file('tinymce', 'vendor/tinymce/tinymce/');
+ui_require_css_file('main.min', 'include/javascript/fullcalendar/');
+ui_require_javascript_file('main.min', 'include/javascript/fullcalendar/');
+ui_require_javascript_file('pandora_fullcalendar');
+

 /**
 * Mask class names.
@ -53,6 +61,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 +175,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 +183,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) {
@ -192,3 +212,115 @@ if ($classname_selected === null) {

    Wizard::printBigButtonsList($wiz_data);
 }
+
+$is_management_allowed = is_management_allowed();
+$task_id = get_parameter('task', '');
+if ($task_id !== '') {
+    $task = db_get_row_filter(
+        'tuser_task_scheduled',
+        ['id' => $task_id]
+    );
+    $args = unserialize($task['args']);
+    $event_calendar = io_safe_output($args['weekly_schedule']);
+} else {
+    $event_calendar = '{"monday":[{"start":"00:00:00","end":"00:00:00"}],"tuesday":[{"start":"00:00:00","end":"00:00:00"}],"wednesday":[{"start":"00:00:00","end":"00:00:00"}],"thursday":[{"start":"00:00:00","end":"00:00:00"}],"friday":[{"start":"00:00:00","end":"00:00:00"}],"saturday":[{"start":"00:00:00","end":"00:00:00"}],"sunday":[{"start":"00:00:00","end":"00:00:00"}]}';
+}
+?>
+<script type="text/javascript">
+    $(document).ready (function () {
+        $("#table-new-job-3").hide();
+        var edit = '<?php echo $task_id; ?>';
+        if (edit != '') {
+            exec_calendar();
+        }
+
+        $("#scheduled").change(exec_calendar);
+
+        function exec_calendar() {
+            if ($("#scheduled").val() == "weekly") {
+                var is_management_allowed = parseInt('<?php echo (int) $is_management_allowed; ?>');
+                var eventsBBDD = '<?php echo $event_calendar; ?>';
+                var events = loadEventBBDD(eventsBBDD);
+                var calendarEl = document.getElementById('calendar_map');
+
+                var options = {
+                    contentHeight: "auto",
+                    headerToolbar: {
+                        left: "",
+                        center: "",
+                        right: is_management_allowed === 0 ? '' : "timeGridWeek,dayGridWeek"
+                    },
+                    buttonText: {
+                        dayGridWeek: '<?php echo __('Simple'); ?>',
+                        timeGridWeek: '<?php echo __('Detailed'); ?>'
+                    },
+                    dayHeaderFormat: { weekday: "short" },
+                    initialView: "dayGridWeek",
+                    navLinks: false,
+                    selectable: true,
+                    selectMirror: true,
+                    slotDuration: "01:00:00",
+                    slotLabelInterval: "02:00:00",
+                    snapDuration: "01:00:00",
+                    slotMinTime: "00:00:00",
+                    slotMaxTime: "24:00:00",
+                    scrollTime: "01:00:00",
+                    locale: "en-GB",
+                    firstDay: 1,
+                    eventTimeFormat: {
+                        hour: "numeric",
+                        minute: "2-digit",
+                        hour12: false
+                    },
+                    eventColor: "#82b92e",
+                    editable: is_management_allowed === 0 ? false : true,
+                    dayMaxEvents: 3,
+                    dayPopoverFormat: { weekday: "long" },
+                    defaultAllDay: false,
+                    displayEventTime: true,
+                    displayEventEnd: true,
+                    selectOverlap: false,
+                    eventOverlap: false,
+                    allDaySlot: true,
+                    droppable: false,
+                    select: is_management_allowed === 0 ? false : select_alert_template,
+                    selectAllow: is_management_allowed === 0 ? false : selectAllow_alert_template,
+                    eventAllow: is_management_allowed === 0 ? false : eventAllow_alert_template,
+                    eventDrop: is_management_allowed === 0 ? false : eventDrop_alert_template,
+                    eventDragStop: is_management_allowed === 0 ? false : eventDragStop_alert_template,
+                    eventResize: is_management_allowed === 0 ? false : eventResize_alert_template,
+                    eventMouseEnter: is_management_allowed === 0 ? false : eventMouseEnter_alert_template,
+                    eventMouseLeave: is_management_allowed === 0 ? false : eventMouseLeave_alert_template,
+                    eventClick: is_management_allowed === 0 ? false : eventClick_alert_template,
+                };
+
+                var settings = {
+                    timeFormat: '<?php echo TIME_FORMAT_JS; ?>',
+                    timeOnlyTitle: '<?php echo __('Choose time'); ?>',
+                    timeText: '<?php echo __('Time'); ?>',
+                    hourText: '<?php echo __('Hour'); ?>',
+                    minuteText: '<?php echo __('Minute'); ?>',
+                    secondText: '<?php echo __('Second'); ?>',
+                    currentText: '<?php echo __('Now'); ?>',
+                    closeText: '<?php echo __('Close'); ?>',
+                    url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
+                    removeText:  '<?php echo __('Remove'); ?>',
+                    userLanguage: '<?php echo get_user_language(); ?>',
+                    loadingText: '<?php echo __('Loading, this operation might take several minutes...'); ?>',
+                    tooltipText: '<?php echo __('Drag out to remove'); ?>',
+                    alert: '<?php echo __('Alert'); ?>'
+                }
+
+                var calendar = fullCalendarPandora(calendarEl, options, settings, events);
+                calendar.render();
+
+                $("#table-new-job-3").show();
+                $('.fc-event-title').hide();
+                $(".fc-button-active" ).trigger( "click" );
+            } else {
+                $("#calendar_map").html();
+                $("#table-new-job-3").hide();
+            }
+        }
+    });
+</script>
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@ -45,9 +45,120 @@ if (! check_acl($config['id_user'], 0, 'AW')) {

 if (isset($_GET['server']) === true) {
    $id_server = get_parameter_get('server');
+    $title = __('Update').' ';
+    $sql = sprintf('SELECT name, ip_address, description, server_type, exec_proxy, port FROM tserver WHERE id_server = %d', $id_server);
+    $row = db_get_row_sql($sql);
+
+    switch ($row['server_type']) {
+        case SERVER_TYPE_DATA:
+            $title .= __('Data server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_NETWORK:
+            $title .= __('Network server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_SNMP:
+            $title .= __('SNMP Trap server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_DISCOVERY:
+            $title .= __('Discovery server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_PLUGIN:
+            $title .= __('Plugin server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_PREDICTION:
+            $title .= __('Prediction server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_WMI:
+            $title .= __('WMI server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_EXPORT:
+            $title .= __('Export server').' ID: '.$id_server;
+            $id_modulo = 0;
+        break;
+
+        case SERVER_TYPE_INVENTORY:
+            $title .= __('Inventory server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_WEB:
+            $title .= __('Web server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_EVENT:
+            $title .= __('Event server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_CORRELATION:
+            $title .= __('Correlation server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_ENTERPRISE_ICMP:
+            $title .= __('Enterprise ICMP server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_ENTERPRISE_SNMP:
+            $title .= __('Enterprise SNMP server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_ENTERPRISE_SATELLITE:
+            $title .= __('Enterprise Satellite server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_ENTERPRISE_TRANSACTIONAL:
+            $title .= __('Enterprise Transactional server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_MAINFRAME:
+            $title .= __('Mainframe server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_SYNC:
+            $title .= __('Sync server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_WUX:
+            $title .= __('Wux server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_SYSLOG:
+            $title .= __('Log server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_NCM:
+            $title .= __('NCM server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_AUTOPROVISION:
+            $title .= __('Autoprovision server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_MIGRATION:
+            $title .= __('Migration server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_ALERT:
+            $title .= __('Alert server').' ID: '.$id_server;
+        break;
+
+        case SERVER_TYPE_NETFLOW:
+            $title .= __('Netflow server').' ID: '.$id_server;
+        break;
+
+        default:
+            $title = __('Update server').' ID: '.$id_server;
+        break;
+    }
+
    // Headers.
    ui_print_standard_header(
-        __('Update Server'),
+        $title,
        'images/gm_servers.png',
        false,
        '',
@ -65,8 +176,6 @@ if (isset($_GET['server']) === true) {
        ]
    );

-    $sql = sprintf('SELECT name, ip_address, description, server_type, exec_proxy, port FROM tserver WHERE id_server = %d', $id_server);
-    $row = db_get_row_sql($sql);
    echo '<form name="servers" method="POST" action="index.php?sec=gservers&sec2=godmode/servers/modificar_server&update=1">';
    html_print_input_hidden('server', $id_server);

--- a/pandora_console/godmode/servers/pending_alerts_list.php
+++ b/pandora_console/godmode/servers/pending_alerts_list.php
@ -0,0 +1,71 @@
+<?php
+/**
+ * Pending alerts list view.
+ *
+ * @category   Pending alerts list
+ * @package    Pandora FMS
+ * @subpackage Opensource
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ * |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ * |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Pandora FMS
+ * Please see https://pandorafms.com/community/ 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'].'/include/class/AlertsList.class.php';
+
+$ajaxPage = 'godmode/servers/pending_alerts_list';
+
+// Control call flow.
+try {
+    // User access and validation is being processed on class constructor.
+    $adw = new AlertsList($ajaxPage);
+} catch (Exception $e) {
+    if (is_ajax()) {
+        echo json_encode(['error' => '[PendingAlertsList]'.$e->getMessage() ]);
+        exit;
+    } else {
+        echo '[PendingAlertsList]'.$e->getMessage();
+    }
+
+    // Stop this execution, but continue 'globally'.
+    return;
+}
+
+// AJAX controller.
+if (is_ajax()) {
+    $method = get_parameter('method');
+
+    if (method_exists($adw, $method) === true) {
+        if ($adw->ajaxMethod($method) === true) {
+            $adw->{$method}();
+        } else {
+            $adw->error('Unavailable method.');
+        }
+    } else {
+        $adw->error('Method not found. ['.$method.']');
+    }
+
+    // Stop any execution.
+    exit;
+} else {
+    // Run.
+    $adw->run();
+}
--- 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;
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@ -28,6 +28,7 @@

 // Begin.
 require_once 'include/functions_clippy.php';
+require_once 'pending_alerts_list.php';

 global $config;

@ -101,6 +102,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 +193,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 {
@ -242,6 +248,19 @@ foreach ($servers as $server) {
            $data[8] .= '</a>';
        }

+        if ($server['type'] === 'event' && (bool) check_acl($config['id_user'], 0, 'LM') === true) {
+            $data[8] .= '<a class="open-alerts-list-modal" href="">';
+            $data[8] .= html_print_image(
+                'images/alert@svg.svg',
+                true,
+                [
+                    'title' => __('Pending alerts list'),
+                    '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='.$server['id_server']).'">';
        $data[8] .= html_print_image(
            'images/edit.svg',
@ -253,9 +272,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 +317,8 @@ foreach ($servers as $server) {
        unset($data[8]);
    }

+    $ext = '';
+
    array_push($table->data, $data);
 }

--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@ -189,7 +189,8 @@ $table->data[1][1] = html_print_label_input_block(
        255,
        true,
        true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );

 $table->data[2][0] = html_print_label_input_block(
@ -202,7 +203,8 @@ $table->data[2][0] = html_print_label_input_block(
        255,
        true,
        true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );

 $table->data[2][1] = html_print_label_input_block(
@ -215,7 +217,8 @@ $table->data[2][1] = html_print_label_input_block(
        255,
        true,
        true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );

 $table->data[3][0] = html_print_label_input_block(
@ -228,7 +231,8 @@ $table->data[3][0] = html_print_label_input_block(
        255,
        true,
        true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );

 $table->data[3][1] = html_print_label_input_block(
@ -325,6 +329,18 @@ if (enterprise_installed() || defined('DESTDIR')) {
        ],
        true
    );
+    $buttons .= html_print_button(
+        __('Show agent usage details'),
+        'agents_details',
+        false,
+        'show_agents_details_dialog()',
+        [
+            'fixed_id' => 'button-agents_details',
+            'icon'     => 'next',
+            'mode'     => 'secondary',
+        ],
+        true
+    );

    html_print_action_buttons(
        $buttons
@ -369,3 +385,80 @@ if (enterprise_hook('print_activate_licence_dialog') == ENTERPRISE_NOT_HOOK) {
    echo '</ul>';
    echo '</div>';
 }
+
+$table = new stdClass();
+$table->width = '100%';
+$table->class = 'databox filter-table-adv';
+$table->size = [];
+$table->size[0] = '50%';
+$table->size[1] = '50%';
+$table->data = [];
+$table->colspan = [];
+
+$table->data[0][0] = html_print_label_input_block(
+    __('Total Agents'),
+    html_print_input_text(
+        'total_agents',
+        $total_agents,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[0][1] = html_print_label_input_block(
+    __('Network & other devices'),
+    html_print_input_text(
+        'type_network',
+        $network_others,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[1][0] = html_print_label_input_block(
+    __('Workstations'),
+    html_print_input_text(
+        'type_workstation',
+        $workstations,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[1][1] = html_print_label_input_block(
+    __('Servers'),
+    html_print_input_text(
+        'type_server',
+        $servers,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[2][0] = html_print_label_input_block(
+    __('Show disabled agents'),
+    html_print_checkbox_switch(
+        'show_disabled_agents',
+        1,
+        1,
+        true,
+        false,
+        'show_disabled_agents()'
+    )
+);
+
+echo '<div id="agents_details_dialog" class="invisible left" title="'.__('Agents usage details').'">';
+html_print_table($table);
+echo '</div>';
--- a/Show More
+++ b/Show More