diff --git a/extras/pandora_gotty/README.md b/extras/pandora_gotty/README.md
index 2e261c2e53..c31e228c46 100644
--- a/extras/pandora_gotty/README.md
+++ b/extras/pandora_gotty/README.md
@@ -1 +1 @@
-To create the .deb and .rpm package need to hace docker installed on main system and execit `build_all_docker.sh`
\ No newline at end of file
+To create the .deb and .rpm package need to hace docker installed on main system and execit `build_all_docker.sh`
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index 0a3a48950c..6284c748f9 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -300,3 +300,7 @@ module_plugin grep_log /var/log/syslog Syslog ssh
 #module_exec echo 5
 #module_description Postcondition test module
 #module_end
+
+# This plugin runs several security checks in a Linux system
+
+#module_plugin pandora_security_check
\ No newline at end of file
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 1e5d17a506..fb1cbfc2d3 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.773.3-231011
+Version: 7.0NG.773.3-231019
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 6d71887328..db62eab155 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.773.3-231011"
+pandora_version="7.0NG.773.3-231019"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 6712d85707..f3babe0ab1 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1031,7 +1031,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.773.3';
-use constant AGENT_BUILD => '231011';
+use constant AGENT_BUILD => '231019';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 2651e76f6b..9068f935ba 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 934a423b89..5fe622218b 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 0fdd28b09f..4a55842d23 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index ae5854da47..12b0a802a6 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773.3"
-PI_BUILD="231011"
+PI_BUILD="231019"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/unix/plugins/pandora_security_check b/pandora_agents/unix/plugins/pandora_security_check
new file mode 100644
index 0000000000..0ad845639b
--- /dev/null
+++ b/pandora_agents/unix/plugins/pandora_security_check
@@ -0,0 +1,631 @@
+#!/usr/bin/perl
+################################################################################
+# Author:     Enrique Martin Garcia
+# Copyright:  2023, PandoraFMS
+# Maintainer: Operations department
+# Version:    1.0
+################################################################################
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+use File::Basename;
+use File::Spec;
+use Digest::MD5 qw(md5_hex);
+use Scalar::Util 'looks_like_number';
+use Socket;
+
+# Define signal handlers
+sub sigint_handler {
+    print STDERR "\nInterrupted by user\n";
+    exit 0;
+}
+
+sub sigterm_handler {
+    print STDERR "Received SIGTERM signal.\n";
+    exit 0;
+}
+
+$SIG{INT} = \&sigint_handler;
+$SIG{TERM} = \&sigterm_handler;
+
+# Add lib dir path
+my $lib_dir = File::Spec->catdir(dirname($0), 'lib');
+unshift @INC, $lib_dir;
+
+###
+# GLOBALS
+##################
+
+my %options = ();
+
+my $modules_group = 'Security';
+
+my $b_ports = 'PORTS';
+my $b_files = 'FILES';
+my $b_passwords = 'PASSWORDS';
+
+my @blocks = ($b_ports, $b_files, $b_passwords);
+my $configuration_block;
+
+my $integrity_file = '/tmp/' . md5_hex(File::Spec->rel2abs($0)) . '.integrity';
+
+# Enable all checks by default
+my $check_selinux = 1;
+my $check_ssh_root_access = 1;
+my $check_ssh_root_keys = 1;
+my $check_ports = 1;
+my $check_files = 1;
+my $check_passwords = 1;
+
+# Include all values for checks by default
+my $include_defaults = 1;
+
+# Initialize check lists
+my @l_ports = (
+    80,
+    22
+);
+my @l_files = (
+    '/etc/shadow',
+    '/etc/passwd',
+    '/etc/hosts',
+    '/etc/resolv.conf',
+    '/etc/ssh/sshd_config',
+    '/etc/rsyslog.conf'
+);
+
+my @l_passwords = (
+    '123456',
+    '12345678',
+    '123456789',
+    '12345',
+    '1234567',
+    'password',
+    '1password',
+    'abc123',
+    'qwerty',
+    '111111',
+    '1234',
+    'iloveyou',
+    'sunshine',
+    'monkey',
+    '1234567890',
+    '123123',
+    'princess',
+    'baseball',
+    'dragon',
+    'football',
+    'shadow',
+    'soccer',
+    'unknown',
+    '000000',
+    'myspace1',
+    'purple',
+    'fuckyou',
+    'superman',
+    'Tigger',
+    'buster',
+    'pepper',
+    'ginger',
+    'qwerty123',
+    'qwerty1',
+    'peanut',
+    'summer',
+    '654321',
+    'michael1',
+    'cookie',
+    'LinkedIn',
+    'whatever',
+    'mustang',
+    'qwertyuiop',
+    '123456a',
+    '123abc',
+    'letmein',
+    'freedom',
+    'basketball',
+    'babygirl',
+    'hello',
+    'qwe123',
+    'fuckyou1',
+    'love',
+    'family',
+    'yellow',
+    'trustno1',
+    'jesus1',
+    'chicken',
+    'diamond',
+    'scooter',
+    'booboo',
+    'welcome',
+    'smokey',
+    'cheese',
+    'computer',
+    'butterfly',
+    '696969',
+    'midnight',
+    'princess1',
+    'orange',
+    'monkey1',
+    'killer',
+    'snoopy ',
+    'qwerty12 ',
+    '1qaz2wsx ',
+    'bandit',
+    'sparky',
+    '666666',
+    'football1',
+    'master',
+    'asshole',
+    'batman',
+    'sunshine1',
+    'bubbles',
+    'friends',
+    '1q2w3e4r',
+    'chocolate',
+    'Yankees',
+    'Tinkerbell',
+    'iloveyou1',
+    'abcd1234',
+    'flower',
+    '121212',
+    'passw0rd',
+    'pokemon',
+    'StarWars',
+    'iloveyou2',
+    '123qwe',
+    'Pussy',
+    'angel1'
+);
+
+###
+# ARGS PARSER
+##################
+
+my $HELP = <<EO_HELP;
+Run several security checks in a Linux system
+
+Usage: $0
+       [-h,--help]
+       [--check_selinux {0,1}]
+       [--check_ssh_root_access {0,1}]
+       [--check_ssh_root_keys {0,1}]
+       [--check_ports {0,1}]
+       [--check_files {0,1}]
+       [--check_passwords {0,1}]
+       [--include_defaults {0,1}]
+       [--integrity_file <integrity_file>]
+       [--conf <conf_file>]
+
+Optional arguments:
+  -h, --help                          Show this help message and exit
+  --check_selinux {0,1}               Enable/Disable check SElinux module
+  --check_ssh_root_access {0,1}       Enable/Disable check SSH root access module
+  --check_ssh_root_keys {0,1}         Enable/Disable check SSH root keys module
+  --check_ports {0,1}                 Enable/Disable check ports module
+  --check_files {0,1}                 Enable/Disable check files module
+  --check_passwords {0,1}             Enable/Disable check passwords module
+  --include_defaults {0,1}            Enable/Disable default plugin checks for ports, files and passwords
+  --integrity_file <integrity_file>   Path to integrity check file
+                                        Default: $integrity_file
+  --conf <conf_file>                  Path to plugin configuration file
+                                        Available configuration blocks:
+                                            [$b_ports], [$b_files] and [$b_passwords]
+                                        Content example:
+                                            [$b_ports]
+                                            3306
+                                            443
+                                            [$b_files]
+                                            /etc/httpd/httpd.conf
+                                            /etc/my.cnf
+                                            [$b_passwords]
+                                            pandora
+                                            PANDORA
+                                            P4nd0r4
+
+EO_HELP
+
+sub help {
+    my ($extra_message) = @_;
+    print $HELP;
+    print $extra_message if defined($extra_message);
+    exit 0;
+}
+
+sub parse_bool_arg {
+    my ($arg, $default) = @_;
+
+    if (defined $options{$arg}) {
+      if (looks_like_number($options{$arg}) && ($options{$arg} == 1 || $options{$arg} == 0)) {
+          return $options{$arg};
+      } else {
+          help("Invalid value for argument: $arg\n");
+      }
+    } else {
+        return $default;
+    }
+}
+
+# Parse arguments
+GetOptions(
+    "help|h"                  => \$options{help},
+    "check_selinux=s"         => \$options{check_selinux},
+    "check_ssh_root_access=s" => \$options{check_ssh_root_access},
+    "check_ssh_root_keys=s"   => \$options{check_ssh_root_keys},
+    "check_ports=s"           => \$options{check_ports},
+    "check_files=s"           => \$options{check_files},
+    "check_passwords=s"       => \$options{check_passwords},
+    "include_defaults=s"      => \$options{include_defaults},
+    "integrity_file=s"        => \$options{integrity_file},
+    "conf=s"                  => \$options{conf}
+);
+
+help() if ($options{help});
+
+$check_selinux         = parse_bool_arg('check_selinux', $check_selinux);
+$check_ssh_root_access = parse_bool_arg('check_ssh_root_access', $check_ssh_root_access);
+$check_ssh_root_keys   = parse_bool_arg('check_ssh_root_keys', $check_ssh_root_keys);
+$check_ports           = parse_bool_arg('check_ports', $check_ports);
+$check_files           = parse_bool_arg('check_files', $check_files);
+$check_passwords       = parse_bool_arg('check_passwords', $check_passwords);
+
+$include_defaults      = parse_bool_arg('include_defaults', $include_defaults);
+
+if (!$include_defaults) {
+    @l_ports = ();
+    @l_files = ();
+    @l_passwords = ();
+}
+
+$integrity_file = $options{integrity_file} if defined $options{integrity_file};
+
+parse_configuration($options{conf}) if defined $options{conf};
+
+###
+# FUNCTIONS
+##################
+
+# Function to parse configuration file
+sub parse_configuration {
+    my ($conf_file) = @_;
+
+    open my $conf_fh, '<', $conf_file or die "Error opening configuration file [$conf_file]: $!\n";
+
+    while (my $line = <$conf_fh>) {
+        chomp $line;
+        $line =~ s/^\s+//;
+        $line =~ s/\s+$//;
+
+        if ($line =~ /^\[($b_ports|$b_files|$b_passwords)\]$/) {
+            $configuration_block = $1;
+        }
+        elsif ($configuration_block) {
+            if ($configuration_block eq $b_ports) {
+                push @l_ports, $line;
+            }
+            elsif ($configuration_block eq $b_files) {
+                push @l_files, $line;
+            }
+            elsif ($configuration_block eq $b_passwords) {
+                push @l_passwords, $line;
+            }
+        }
+    }
+
+    close $conf_fh;
+}
+
+# Function to print module XML to STDOUT
+sub print_xml_module {
+    my ($m_name, $m_type, $m_desc, $m_value) = @_;
+
+    print "<module>\n";
+    print "\t<name><![CDATA[$m_name]]></name>\n";
+    print "\t<type>$m_type</type>\n";
+    print "\t<data><![CDATA[$m_value]]></data>\n";
+    print "\t<description><![CDATA[$m_desc]]></description>\n";
+    print "\t<module_group>$modules_group</module_group>\n";
+    print "</module>\n";
+}
+
+# Make unique array
+sub uniq {
+    my %seen;
+    return grep { !$seen{$_}++ } @_;
+}
+
+###
+# MAIN
+##################
+
+# Check SELinux status
+if ($check_selinux) {
+    my $value = 0;
+    my $desc = 'SELinux is disabled.';
+    
+    my $output = `sestatus 2> /dev/null`;
+    if ($? == 0) {
+      if ($output =~ /SELinux status: enabled/) {
+          $value = 1;
+          $desc = 'SELinux is enabled.';
+      }
+    } else {
+      $value = 0;
+      $desc = 'Can not determine if SELinux is enabled.';
+    }
+
+    print_xml_module('SELinux status', 'generic_proc', $desc, $value);
+}
+
+# Check if SSH allows root access
+if ($check_ssh_root_access) {
+    my $value = 1;
+    my $desc = 'SSH does not allow root access.';
+    
+    my $ssh_config_file = '/etc/ssh/sshd_config';
+    if (-e $ssh_config_file && open my $ssh_fh, '<', $ssh_config_file) {
+        while (my $line = <$ssh_fh>) {
+            chomp $line;
+            $line =~ s/^\s+//;
+            $line =~ s/\s+$//;
+            next if $line =~ /^$/ or $line =~ /^#/;
+            my ($option, $val) = split /\s+/, $line, 2;
+            if ($option eq 'PermitRootLogin' && lc($val) ne 'no') {
+                $value = 0;
+                $desc = 'SSH config allows root access.';
+                last;
+            }
+        }
+        close $ssh_fh;
+    } else {
+        $value = 0;
+        $desc = 'Can not read '.$ssh_config_file.' to check if root access allowed.';
+    }
+
+    print_xml_module('SSH root access status', 'generic_proc', $desc, $value);
+}
+
+# Specific function for recursive directory check
+sub find_files {
+    my ($dir) = @_;
+
+    my @files = ();
+
+    opendir my $dh, $dir or return;
+    while (my $file = readdir $dh) {
+        next if $file eq '.' or $file eq '..';
+
+        my $file_path = File::Spec->catfile($dir, $file);
+        if (-f $file_path) {
+            push @files, $file_path;
+        } elsif (-d $file_path) {
+            push @files, find_files($file_path);
+        }
+    }
+    closedir $dh;
+
+    return @files;
+}
+
+# Check if /root has SSH keys
+if ($check_ssh_root_keys) {
+    my $value = 1;
+    my $desc = 'SSH root keys not found.';
+    
+    my $ssh_keys = {'private' => [], 'public' => []};
+
+    my $ssh_dir = '/root/.ssh';
+    my @all_files = find_files($ssh_dir);
+    foreach my $file (@all_files) {
+        if (open my $fh, '<:raw', $file) {
+            my $content = '';
+            while(my $l = <$fh>) {
+                $content .= $l;
+            }
+            if ($content) {
+                my ($filename, $directories) = fileparse($file);
+                if ($content =~ /-----BEGIN RSA PRIVATE KEY-----.*?-----END RSA PRIVATE KEY-----/s) {
+                    push @{$ssh_keys->{'private'}}, $file;
+                } elsif ($content =~ /ssh-rsa/ && $filename ne 'known_hosts' && $filename ne 'authorized_keys') {
+                    push @{$ssh_keys->{'public'}}, $file;
+                }
+            }
+        }
+    }
+
+    if (@{$ssh_keys->{'private'}} > 0 || @{$ssh_keys->{'public'}} > 0) {
+        $value = 0;
+        $desc = "SSH root keys found:\n" . join("\n", @{$ssh_keys->{'private'}}, @{$ssh_keys->{'public'}});
+    }
+
+    print_xml_module('SSH root keys status', 'generic_proc', $desc, $value);
+}
+
+# Check authorized ports
+if ($check_ports) {
+    my $value = 1;
+    my $desc = 'No unauthorized ports found.';
+    
+    my @open_ports;
+    my @not_allowed_ports;
+    
+    my @net_tcp_files = ('/proc/net/tcp', '/proc/net/tcp6');
+    foreach my $net_tcp_file (@net_tcp_files) {
+        if (-e $net_tcp_file && open my $tcp_fh, '<', $net_tcp_file) {
+            while (my $line = <$tcp_fh>) {
+                chomp $line;
+                my @parts = split /\s+/, $line;
+                if (scalar @parts >= 12) {
+                    my $local_addr_hex = (split /:/, $parts[2])[0];
+                    my $local_port_hex = (split /:/, $parts[2])[1];
+                    my $state = $parts[4];
+                        
+                    # Check if the connection is in state 0A (listening)
+                    if ($state eq "0A") {
+                        my $local_addr_4 = join('.', reverse split(/\./, inet_ntoa(pack("N", hex($local_addr_hex)))));
+                        my $local_addr_6 = join(':', map { hex($_) } unpack("(A4)*", $local_addr_hex));
+
+                        # Skip localhost listening ports
+                        if ($local_addr_4 eq "127.0.0.1" || $local_addr_6 eq "0:0:0:0:0:0:0:1") {
+                            next;
+                        }
+
+                        my $local_port = hex($local_port_hex);
+                        push @open_ports, $local_port;
+                    }
+                }
+            }
+            close $tcp_fh;
+        }
+    }
+    @open_ports = uniq(@open_ports);
+    
+    my %allowed_ports;
+    foreach my $port (@l_ports) {
+        $allowed_ports{$port} = 1;
+    }
+
+    foreach my $port (@open_ports) {
+        if (!exists $allowed_ports{$port}) {
+            push @not_allowed_ports, $port;
+        }
+    }
+
+    if (@not_allowed_ports) {
+        $value = 0;
+        $desc = "Unauthorized ports found:\n" . join("\n", @not_allowed_ports);
+    }
+
+    print_xml_module('Authorized ports status', 'generic_proc', $desc, $value);
+}
+
+# Check files integrity
+if ($check_files) {
+    my $value = 1;
+    my $desc = 'No changed files found.';
+    
+    my %integrity;
+
+    my $can_check_files = 0;
+
+    if (-e $integrity_file) {
+        if (-r $integrity_file && -w $integrity_file) {
+            # Read integrity file content
+            open my $integrity_fh, '<', $integrity_file;
+            while (my $line = <$integrity_fh>) {
+                chomp $line;
+                if ($line =~ /^\s*(.*?)=(.*?)\s*$/) {
+                    $integrity{$1} = $2;
+                }
+            }
+            close $integrity_fh;
+            $can_check_files = 1;
+        } else {
+            $value = 0;
+            $desc = 'Integrity check file can not be read or written: ' . $integrity_file;
+        }
+    } else {
+        if (open my $integrity_fh, '>', $integrity_file) {
+            close $integrity_fh;
+            $can_check_files = 1;
+        } else {
+            $value = 0;
+            $desc = 'Integrity check file can not be created: ' . $integrity_file;
+        }
+    }
+
+    if ($can_check_files) {
+        # Check each file integrity
+        my @errored_files;
+        my @no_integrity_files;
+
+        # Create unique check files list
+        @l_files = uniq(@l_files);
+
+        foreach my $file (@l_files) {
+            my $file_key = md5_hex($file);
+            if (open my $fh, '<:raw', $file) {
+                my $md5 = Digest::MD5->new;
+                $md5->addfile($fh);
+                my $file_md5 = $md5->hexdigest;
+                chomp $file_md5;
+                close $fh;
+                
+                if (exists $integrity{$file_key} && $integrity{$file_key} ne $file_md5) {
+                    push @no_integrity_files, $file;
+                }
+                $integrity{$file_key} = $file_md5;
+            } else {
+                push @errored_files, $file;
+            }
+        }
+
+        # Overwrite integrity file content
+        open my $file_handle, '>', $integrity_file;
+        print $file_handle map { "$_=$integrity{$_}\n" } keys %integrity;
+        close $file_handle;
+        
+        # Check module status
+        if (@no_integrity_files) {
+            $value = 0;
+            $desc = "Changed files found:\n" . join("\n", @no_integrity_files);
+        }
+
+        if (@errored_files) {
+            $value = 0;
+            $desc .= "\nUnable to check integrity of some files:\n" . join("\n", @errored_files);
+        }
+    }
+
+    print_xml_module('Files check status', 'generic_proc', $desc, $value);
+}
+
+# Check weak passwords
+if ($check_passwords) {
+    my $value = 1;
+    my $desc = 'No insecure passwords found.';
+    
+    # Create unique check passwords list
+    @l_passwords = uniq(@l_passwords);
+
+    my @insecure_users;
+    
+    my $shadow_file = '/etc/shadow';
+    if (-e $shadow_file && -r $shadow_file) {
+        open my $shadow_fh, '<', $shadow_file;
+        while (my $line = <$shadow_fh>) {
+            chomp $line;
+            my ($username, $password_hash, @rest) = split /:/, $line;
+
+            # Skip users with no password hash
+            if ($password_hash ne "*" && $password_hash ne "!!" && $password_hash ne "!locked") {
+                my $salt = substr($password_hash, 0, rindex($password_hash, '$') + 1);
+                my $user_hash = crypt($username, $salt);
+                if ($user_hash eq $password_hash) {
+                    push @insecure_users, $username;
+                } else {
+                    foreach my $weak_password (@l_passwords) {
+                        my $weak_password_hash = crypt($weak_password, $salt);
+
+                        if ($weak_password_hash eq $password_hash) {
+                            push @insecure_users, $username;
+                            last;
+                        }
+                    }
+                }
+            }
+        }
+        close $shadow_fh;
+    } else {
+        $value = 0;
+        $desc = 'Can not read '.$shadow_file.' to check passwords.';
+    }
+
+    if (@insecure_users) {
+        $value = 0;
+        $desc = "Users with insecure passwords found:\n" . join("\n", @insecure_users);
+    }
+
+    print_xml_module('Insecure passwords status', 'generic_proc', $desc, $value);
+}
\ No newline at end of file
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index a3543a5145..17bd3b95d5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231011}
+{231019}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 23a04f98fa..1edf51aab3 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.773.3 Build 231011")
+#define PANDORA_VERSION ("7.0NG.773.3 Build 231019")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d4cd471aed..d9b1937bd0 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.773.3(Build 231011))"
+      VALUE "ProductVersion", "(7.0NG.773.3(Build 231019))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4c917cbe13..c30a3c80db 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.773.3-231011
+Version: 7.0NG.773.3-231019
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index c540258156..d37ca4444c 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.773.3-231011"
+pandora_version="7.0NG.773.3-231019"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index ac3d1d22c5..b03fe77f58 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -192,7 +192,7 @@ function quickShell()
                             'name'  => 'form-sent',
                             'value' => true,
                         ],
-                    ]
+                    ],
                 ],
             ],
             false,
@@ -292,7 +292,6 @@ function quickShellSettings()
     ui_require_css_file('discovery');
 
     // Gotty settings. Internal communication (WS).
-
     if (isset($config['gotty_ssh_enabled']) === false) {
         config_update_value('gotty_ssh_enabled', 1);
     }
diff --git a/pandora_console/extras/mr/66.sql b/pandora_console/extras/mr/66.sql
index 606bcea909..b7b2b400d7 100644
--- a/pandora_console/extras/mr/66.sql
+++ b/pandora_console/extras/mr/66.sql
@@ -117,6 +117,22 @@ INSERT IGNORE INTO `tdiscovery_apps_scripts` (`id_app`, `macro`, `value`) VALUES
 -- Insert into tdiscovery_apps_executions
 INSERT IGNORE INTO `tdiscovery_apps_executions` (`id`, `id_app`, `execution`) VALUES (1, @id_app, '&#039;_exec1_&#039;&#x20;-g&#x20;&#039;__taskGroup__&#039;&#x20;--host&#x20;&#039;_host_&#039;&#x20;--port&#x20;&#039;_port_&#039;&#x20;--user&#x20;&#039;_user_&#039;&#x20;--password&#x20;&#039;_password_&#039;&#x20;--vm&#x20;&#039;_scanVM_&#039;&#x20;--lxc&#x20;&#039;_scanLXC_&#039;&#x20;--backups&#x20;&#039;_scanBackups_&#039;&#x20;--nodes&#x20;&#039;_scanNodes_&#039;&#x20;--transfer_mode&#x20;tentacle&#x20;--tentacle_address&#x20;&#039;_tentacleIP_&#039;&#x20;--tentacle_port&#x20;&#039;_tentaclePort_&#039;&#x20;--as_discovery_plugin&#x20;1');
 
+-- Insert new SAP APP
+SET @short_name = 'pandorafms.sap.deset';
+SET @name = 'SAP&#x20;R3&#x20;-&#x20;Deset';
+SET @section = 'app';
+SET @description = 'Monitor&#x20;SAP&#x20;R3&#x20;environments';
+SET @version = '1.0';
+INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
+SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;
+
+-- Insert into tdiscovery_apps_scripts
+INSERT IGNORE INTO `tdiscovery_apps_scripts` (`id_app`, `macro`, `value`) VALUES (@id_app, '_exec1_', 'bin/pandora_sap_deset');
+INSERT IGNORE INTO `tdiscovery_apps_scripts` (`id_app`, `macro`, `value`) VALUES (@id_app, '_java_', 'bin/lib/jre/bin/java');
+
+-- Insert into tdiscovery_apps_executions
+INSERT IGNORE INTO `tdiscovery_apps_executions` (`id`, `id_app`, `execution`) VALUES (1, @id_app, '&#039;_exec1_&#039;&#x20;--conf&#x20;&#039;_tempfileConf_&#039;&#x20;--custom_modules&#x20;&#039;_tempfileCustomModules_&#039;');
+
 -- Insert new EC2 APP
 SET @short_name = 'pandorafms.aws.ec2';
 SET @name = 'Amazon&#x20;EC2';
@@ -202,5 +218,54 @@ ALTER TABLE `treport_content`  ADD COLUMN `ignore_skipped` INT NOT NULL DEFAULT
 ALTER TABLE `treport_content`  ADD COLUMN `status_of_check` TINYTEXT;
 
 ALTER TABLE `tservice` ADD COLUMN `enable_horizontal_tree` TINYINT NOT NULL DEFAULT 0;
+INSERT INTO tmodule_group (name) SELECT ('Security') WHERE NOT EXISTS (SELECT name FROM tmodule_group WHERE LOWER(name) = 'security');
+
+SET @tmodule_name = 'CPU';
+SET @tmodule_description = 'CPU';
+SET @id_os = 2;
+
+INSERT INTO tmodule_inventory (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`) 
+SELECT * FROM (SELECT @id_os id_os, @tmodule_name name, @tmodule_description description, '' interpreter, 'Brand;Clock;Model' data_format, '' code, '0' block_mode, 2 script_mode) AS tmp 
+WHERE NOT EXISTS (SELECT name, description FROM tmodule_inventory WHERE name = @tmodule_name and description = @tmodule_description and id_os = @id_os);
+
+SET @tmodule_name = 'RAM';
+SET @tmodule_description = 'RAM';
+SET @id_os = 2;
+
+INSERT INTO tmodule_inventory (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`) 
+SELECT * FROM (SELECT @id_os id_os, @tmodule_name name, @tmodule_description description, '' interpreter, 'Size' data_format, '' code, '0' block_mode, 2 script_mode) AS tmp 
+WHERE NOT EXISTS (SELECT name, description FROM tmodule_inventory WHERE name = @tmodule_name and description = @tmodule_description and id_os = @id_os);
+
+SET @tmodule_name = 'NIC';
+SET @tmodule_description = 'NIC';
+SET @id_os = 2;
+
+INSERT INTO tmodule_inventory (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`) 
+SELECT * FROM (SELECT @id_os id_os, @tmodule_name name, @tmodule_description description, '' interpreter, 'NIC;Mac;Speed' data_format, '' code, '0' block_mode, 2 script_mode) AS tmp 
+WHERE NOT EXISTS (SELECT name, description FROM tmodule_inventory WHERE name = @tmodule_name and description = @tmodule_description and id_os = @id_os);
+
+SET @tmodule_name = 'Software';
+SET @tmodule_description = 'Software';
+SET @id_os = 2;
+
+INSERT INTO tmodule_inventory (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`) 
+SELECT * FROM (SELECT @id_os id_os, @tmodule_name name, @tmodule_description description, '' interpreter, 'PKGINST;VERSION;NAME' data_format, '' code, '0' block_mode, 2 script_mode) AS tmp 
+WHERE NOT EXISTS (SELECT name, description FROM tmodule_inventory WHERE name = @tmodule_name and description = @tmodule_description and id_os = @id_os);
+
+SET @tmodule_name = 'Security';
+SET @tmodule_description = 'Hardening&#x20;plugin&#x20;for&#x20;security&#x20;compliance&#x20;analysis';
+SET @id_os = 1;
+
+INSERT INTO tmodule_inventory (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`)
+SELECT * FROM (SELECT @id_os id_os, @tmodule_name name, @tmodule_description description, '' interpreter, 'ID:STATUS' data_format, '' code, '0' block_mode, 2 script_mode) AS tmp 
+WHERE NOT EXISTS (SELECT name, description FROM tmodule_inventory WHERE name = @tmodule_name and description = @tmodule_description and id_os = @id_os);
+
+SET @tmodule_name = 'Security';
+SET @tmodule_description = 'Hardening&#x20;plugin&#x20;for&#x20;security&#x20;compliance&#x20;analysis';
+SET @id_os = 9;
+
+INSERT INTO tmodule_inventory (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`)
+SELECT * FROM (SELECT @id_os id_os, @tmodule_name name, @tmodule_description description, '' interpreter, 'ID:STATUS' data_format, '' code, '0' block_mode, 2 script_mode) AS tmp 
+WHERE NOT EXISTS (SELECT name, description FROM tmodule_inventory WHERE name = @tmodule_name and description = @tmodule_description and id_os = @id_os);
 
 COMMIT;
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index f70af23627..d9a0d3ba22 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -1668,6 +1668,12 @@ ui_require_jquery_file('json');
 <script type="text/javascript">
 /* <![CDATA[ */
 $(document).ready (function () {
+
+    // Set close on select for module group.
+    $("#id_module_group").select2({
+        closeOnSelect: true
+    });
+
     var disabledBecauseInPolicy = <?php echo '\''.((empty($disabledBecauseInPolicy) === true) ? '0' : '1').'\''; ?>;
     var idModuleType  = '<?php echo $type_names_hash[$id_module_type]; ?>';
     if (idModuleType != '') {
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 291e0a1f01..e6032de2f6 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1284,7 +1284,7 @@ $class = 'databox filters';
                 ?>
             </td>
             <td>
-                <?php 
+                <?php
                 html_print_input_text(
                     'text_os_version',
                     $text_os_version,
@@ -6625,7 +6625,7 @@ function addGeneralRow() {
 function loadGeneralAgents(agent_group) {
     var params = [];
 
-    var group = <?php echo $group ?? -1; ?>;
+    var group = <?php echo ($group ?? -1); ?>;
     if (group < 0) {
         return;
     }
diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php
index d8a2f47d00..2d0e54a681 100644
--- a/pandora_console/godmode/setup/os.builder.php
+++ b/pandora_console/godmode/setup/os.builder.php
@@ -290,6 +290,7 @@ html_print_action_buttons(
 
 echo '</form>';
 
+
 function get_list_os_icons_dir()
 {
     global $config;
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 1ce9756cc0..20d1b41561 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -98,7 +98,10 @@ try {
             'ajax_url'            => 'include/ajax/os',
             'ajax_data'           => ['method' => 'drawOSTable'],
             'ajax_postprocess'    => 'process_datatables_item(item)',
-            'no_sortable_columns' => [-1, 1],
+            'no_sortable_columns' => [
+                -1,
+                1,
+            ],
             'order'               => [
                 'field'     => 'id',
                 'direction' => 'asc',
diff --git a/pandora_console/godmode/setup/os_version.builder.php b/pandora_console/godmode/setup/os_version.builder.php
index caf968e5be..8c73b4b453 100644
--- a/pandora_console/godmode/setup/os_version.builder.php
+++ b/pandora_console/godmode/setup/os_version.builder.php
@@ -53,7 +53,7 @@ if ($idOS > 0) {
 } else {
     $product = io_safe_input(strip_tags(io_safe_output((string) get_parameter('product'))));
     $version = io_safe_input(strip_tags(io_safe_output((string) get_parameter('version'))));
-    $end_of_life_date = get_parameter('end_of_life_date', date("Y/m/d"));
+    $end_of_life_date = get_parameter('end_of_life_date', date('Y/m/d'));
 }
 
 $message = '';
diff --git a/pandora_console/godmode/setup/os_version.php b/pandora_console/godmode/setup/os_version.php
index ec5d27beae..8c9816cc7f 100644
--- a/pandora_console/godmode/setup/os_version.php
+++ b/pandora_console/godmode/setup/os_version.php
@@ -220,7 +220,7 @@ switch ($tab) {
     break;
 
     default:
-    // Default.
+        // Default.
     break;
 }
 
@@ -282,4 +282,4 @@ if (empty($id_message) === false) {
     }
 }
 
-include_once $config['homedir'].'/godmode/setup/os_version.list.php';
+require_once $config['homedir'].'/godmode/setup/os_version.list.php';
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 995116ac19..e831022c23 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1268,7 +1268,7 @@ class DiscoveryTaskList extends HTML
 
         $status = db_get_value('status', 'trecon_task', 'id_rt', $id_task);
         if ($status < 0) {
-            $status = 100;
+            $status = '100';
         }
 
         echo json_encode($status);
@@ -1287,7 +1287,6 @@ class DiscoveryTaskList extends HTML
         $result = '<div class="flex">';
         $result .= '<div class="subtitle">';
         $result .= '<span>'._('Overall Progress').'</span>';
-
         $result .= '<div class="mrgn_top_25px">';
         $result .= progress_circular_bar(
             $task['id_rt'],
@@ -1973,7 +1972,6 @@ class DiscoveryTaskList extends HTML
     {
         $status = '';
         $can_be_reviewed = false;
-
         if (empty($task['summary']) === false
             && $task['summary'] == 'cancelled'
         ) {
@@ -1991,11 +1989,9 @@ class DiscoveryTaskList extends HTML
                     $status = __('Done');
                 }
             } else if ($task['utimestamp'] == 0
-                && empty($task['summary'])
+                && (bool) empty($task['summary']) === true
             ) {
                 $status = __('Not started');
-            } else if ($task['utimestamp'] > 0) {
-                $status = __('Done');
             } else {
                 $status = __('Pending');
             }
diff --git a/pandora_console/images/module_event_critical.png b/pandora_console/images/module_event_critical.png
new file mode 100644
index 0000000000..d92fd2cf07
Binary files /dev/null and b/pandora_console/images/module_event_critical.png differ
diff --git a/pandora_console/images/module_event_ok.png b/pandora_console/images/module_event_ok.png
new file mode 100644
index 0000000000..d92fd2cf07
Binary files /dev/null and b/pandora_console/images/module_event_ok.png differ
diff --git a/pandora_console/images/module_event_unknown.png b/pandora_console/images/module_event_unknown.png
new file mode 100644
index 0000000000..d92fd2cf07
Binary files /dev/null and b/pandora_console/images/module_event_unknown.png differ
diff --git a/pandora_console/images/module_event_warning.png b/pandora_console/images/module_event_warning.png
new file mode 100644
index 0000000000..d92fd2cf07
Binary files /dev/null and b/pandora_console/images/module_event_warning.png differ
diff --git a/pandora_console/include/ajax/custom_fields.php b/pandora_console/include/ajax/custom_fields.php
index a403f77748..f247c2e51e 100644
--- a/pandora_console/include/ajax/custom_fields.php
+++ b/pandora_console/include/ajax/custom_fields.php
@@ -65,6 +65,7 @@ if (check_login()) {
         }
     }
 
+
     if ($get_custom_fields_data) {
         $name_custom_fields = get_parameter('name_custom_fields', 0);
         $array_custom_fields_data = get_custom_fields_data($name_custom_fields);
@@ -110,30 +111,51 @@ if (check_login()) {
 
         // Table temporary for save array in table
         // by order and search custom_field data.
-        $table_temporary = 'CREATE TEMPORARY TABLE temp_custom_fields (
-		id_server int(10),
-		id_agent int(10),
-		name_custom_fields varchar(2048),
-        critical_count int,
-        warning_count int,
-        unknown_count int,
-        notinit_count int,
-        normal_count int,
-        total_count int,
-		`status` int(2),
-		KEY `data_index_temp_1` (`id_server`, `id_agent`)
-	)';
-        db_process_sql($table_temporary);
+        if (is_metaconsole() === true) {
+            $table_temporary = 'CREATE TEMPORARY TABLE temp_custom_fields (
+            id_server int(10),
+            id_agent int(10),
+            name_custom_fields varchar(2048),
+            critical_count int,
+            warning_count int,
+            unknown_count int,
+            notinit_count int,
+            normal_count int,
+            total_count int,
+            `status` int(2),
+            KEY `data_index_temp_1` (`id_server`, `id_agent`)
+            )';
+        } else {
+            $table_temporary = 'CREATE TEMPORARY TABLE temp_custom_fields (
+                id_agent int(10),
+                name_custom_fields varchar(2048),
+                critical_count int,
+                warning_count int,
+                unknown_count int,
+                notinit_count int,
+                normal_count int,
+                total_count int,
+                `status` int(2),
+                KEY `data_index_temp_1` ( `id_agent`)
+                )';
+        }
+
+        $resul_tab_temp = db_process_sql($table_temporary);
 
         // Insert values array in table temporary.
         $values_insert = [];
         foreach ($indexed_descriptions as $key => $value) {
-            $values_insert[] = '('.$value['id_server'].', '.$value['id_agente'].", '".$value['description']."', '".$value['critical_count']."', '".$value['warning_count']."', '".$value['unknown_count']."', '".$value['notinit_count']."', '".$value['normal_count']."', '".$value['total_count']."', ".$value['status'].')';
+            if (is_metaconsole() === true) {
+                $values_insert[] = '('.$value['id_server'].', '.$value['id_agente'].", '".$value['description']."', '".$value['critical_count']."', '".$value['warning_count']."', '".$value['unknown_count']."', '".$value['notinit_count']."', '".$value['normal_count']."', '".$value['total_count']."', ".$value['status'].')';
+            } else {
+                $values_insert[] = '('.$value['id_agente'].", '".$value['description']."', '".$value['critical_count']."', '".$value['warning_count']."', '".$value['unknown_count']."', '".$value['notinit_count']."', '".$value['normal_count']."', '".$value['total_count']."', ".$value['status'].')';
+            }
         }
 
         $values_insert_implode = implode(',', $values_insert);
         $query_insert = 'INSERT INTO temp_custom_fields VALUES '.$values_insert_implode;
-        db_process_sql($query_insert);
+
+        $result_temp = db_process_sql($query_insert);
 
         // Search table for alias, custom field data, server_name, direction.
         $search_query = '';
@@ -199,41 +221,17 @@ if (check_login()) {
         }
 
         // Query all fields result.
-        $query = sprintf(
-            'SELECT
-			tma.id_agente,
-			tma.id_tagente,
-			tma.id_tmetaconsole_setup,
-			tma.alias,
-			tma.direccion,
-			tma.server_name,
-			temp.name_custom_fields,
-			temp.status
-		FROM tmetaconsole_agent tma
-		INNER JOIN temp_custom_fields temp
-			ON temp.id_agent = tma.id_tagente
-			AND temp.id_server = tma.id_tmetaconsole_setup
-		WHERE tma.disabled = 0
-		%s
-        %s
-        %s
-		%s
-		LIMIT %d OFFSET %d
-		',
-            $search_query,
-            $status_agent_search,
-            $status_module_search,
-            $order_by,
-            $length,
-            $start
-        );
-
-        $result = db_get_all_rows_sql($query);
-
-        // Query count.
-        $query_count = sprintf(
-            'SELECT
-			COUNT(tma.id_agente) AS `count`
+        if (is_metaconsole() === true) {
+            $query = sprintf(
+                'SELECT
+                tma.id_agente,
+                tma.id_tagente,
+                tma.id_tmetaconsole_setup,
+                tma.alias,
+                tma.direccion,
+                tma.server_name,
+                temp.name_custom_fields,
+                temp.status
             FROM tmetaconsole_agent tma
             INNER JOIN temp_custom_fields temp
                 ON temp.id_agent = tma.id_tagente
@@ -242,16 +240,87 @@ if (check_login()) {
             %s
             %s
             %s
+            %s
+            LIMIT %d OFFSET %d
             ',
-            $search_query,
-            $status_agent_search,
-            $status_module_search
-        );
+                $search_query,
+                $status_agent_search,
+                $status_module_search,
+                $order_by,
+                $length,
+                $start
+            );
+        } else {
+            $query = sprintf(
+                'SELECT
+                tma.id_agente,
+                tma.alias,
+                tma.direccion,
+                tma.server_name,
+                temp.name_custom_fields,
+                temp.status
+            FROM tagente as tma
+            INNER JOIN temp_custom_fields temp
+                ON temp.id_agent = tma.id_agente
+            WHERE tma.disabled = 0
+            %s
+            %s
+            %s
+            %s
+            LIMIT %d OFFSET %d
+            ',
+                $search_query,
+                $status_agent_search,
+                $status_module_search,
+                $order_by,
+                $length,
+                $start
+            );
+        }
+
+        $result = db_get_all_rows_sql($query);
+        // Query count.
+        if (is_metaconsole() === true) {
+            $query_count = sprintf(
+                'SELECT
+                COUNT(tma.id_agente) AS `count`
+                FROM tmetaconsole_agent tma
+                INNER JOIN temp_custom_fields temp
+                    ON temp.id_agent = tma.id_tagente
+                    AND temp.id_server = tma.id_tmetaconsole_setup
+                WHERE tma.disabled = 0
+                %s
+                %s
+                %s
+                ',
+                $search_query,
+                $status_agent_search,
+                $status_module_search
+            );
+        } else {
+            $query_count = sprintf(
+                'SELECT
+                COUNT(tma.id_agente) AS `count`
+                FROM tagente tma
+                INNER JOIN temp_custom_fields temp
+                    ON temp.id_agent = tma.id_agente
+                WHERE tma.disabled = 0
+                %s
+                %s
+                %s
+                ',
+                $search_query,
+                $status_agent_search,
+                $status_module_search
+            );
+        }
 
         $count = db_get_sql($query_count);
-
         // For link nodes.
-        $array_nodes = metaconsole_get_connections();
+        if (is_metaconsole() === true) {
+            $array_nodes = metaconsole_get_connections();
+        }
+
         if (isset($array_nodes) && is_array($array_nodes)) {
             $hash_array_nodes = [];
             foreach ($array_nodes as $key => $server) {
@@ -280,19 +349,24 @@ if (check_login()) {
         $data = [];
         foreach ($result as $values) {
             $image_status = agents_get_image_status($values['status']);
-
             // Link nodes.
-            $agent_link = '<a href="'.$hash_array_nodes[$values['id_tmetaconsole_setup']]['server_url'].'/index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$values['id_tagente'].$hash_array_nodes[$values['id_tmetaconsole_setup']]['hashurl'].'">';
+            if (is_metaconsole() === true) {
+                $agent_link = '<a href="'.$hash_array_nodes[$values['id_tmetaconsole_setup']]['server_url'].'/index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$values['id_tagente'].$hash_array_nodes[$values['id_tmetaconsole_setup']]['hashurl'].'">';
+                $agent_alias = ui_print_truncate_text(
+                    $values['alias'],
+                    'agent_small',
+                    false,
+                    true,
+                    true,
+                    '[&hellip;]',
+                    'font-size:7.5pt;'
+                );
+            } else {
+                $agent_link = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$values['id_agente'].'"/>';
+                $agent_alias = $values['alias'];
+            }
+
 
-            $agent_alias = ui_print_truncate_text(
-                $values['alias'],
-                'agent_small',
-                false,
-                true,
-                true,
-                '[&hellip;]',
-                'font-size:7.5pt;'
-            );
 
             if (can_user_access_node()) {
                 $agent = $agent_link.'<b>'.$agent_alias.'</b></a>';
@@ -300,6 +374,11 @@ if (check_login()) {
                 $agent = $agent_alias;
             }
 
+            if (is_metaconsole() === false) {
+                $values['id_tagente'] = $values['id_agente'];
+                $values['id_tmetaconsole_setup'] = 1;
+            }
+
             $data[] = [
                 'ref'               => $referencia,
                 'data_custom_field' => ui_bbcode_to_html($values['name_custom_fields']),
@@ -405,7 +484,7 @@ if (check_login()) {
 
         $table_modules = new stdClass();
         $table_modules->width = '100%';
-        $table_modules->class = 'databox data';
+        $table_modules->class = 'databox data custom_field_data';
 
         $table_modules->head = [];
         $table_modules->head[0] = __('Module name');
@@ -589,7 +668,11 @@ if (check_login()) {
                 __('Load filter'),
                 'load_filter',
                 false,
-                'class="sub upd"',
+                [
+                    'icon'    => 'search',
+                    'class'   => 'sub upd',
+                    'onclick' => 'load_filter()',
+                ],
                 true
             );
 
@@ -608,12 +691,14 @@ if (check_login()) {
             ),
             true
         );
-
         $table = new StdClass;
         $table->id = 'save_filter_form';
         $table->width = '100%';
         $table->class = 'databox';
         $table->rowspan = [];
+        $table->style = [];
+        $table->cellstyle[0][0] = 'display: grid';
+        $table->cellstyle[0][1] = 'display: grid';
 
         if ($filters['id'] == 'extended_create_filter') {
             echo "<div id='msg_error_create'></div>";
@@ -624,7 +709,7 @@ if (check_login()) {
                 '',
                 15,
                 255,
-                true
+                true,
             );
 
             $table->data[1][0] = __('Group');
@@ -650,11 +735,16 @@ if (check_login()) {
             );
 
             $table->rowspan[0][2] = 2;
+
             $table->data[0][2] = html_print_submit_button(
                 __('Create filter'),
                 'create_filter',
                 false,
-                'class="sub upd"',
+                [
+                    'icon'    => 'search',
+                    'class'   => 'sub upd',
+                    'onclick' => 'create_filter()',
+                ],
                 true
             );
         } else {
@@ -702,14 +792,23 @@ if (check_login()) {
                 __('Delete filter'),
                 'delete_filter',
                 false,
-                'class="sub upd"',
+                [
+                    'icon'    => 'delete',
+                    'class'   => 'sub upd',
+                    'onclick' => 'delete_filter()',
+                ],
                 true
             );
+
             $table->data[1][2] = html_print_submit_button(
                 __('Update filter'),
                 'update_filter',
                 false,
-                'class="sub upd"',
+                [
+                    'icon'    => 'update',
+                    'class'   => 'sub upd',
+                    'onclick' => 'update_filter()',
+                ],
                 true
             );
         }
diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index b5f6d44ab7..0d105d5994 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -124,18 +124,22 @@ if (empty($apiPassword) === true
     ) {
         // Allow internal direct node -> metaconsole connection
         // or node -> own console connection.
+        $server_uid = get_parameter(('server_auth'));
         $config['__internal_call'] = true;
-        $config['id_usuario'] = 'admin';
+        $config['id_usuario'] = $server_uid;
         // Compat.
-        $config['id_user'] = 'admin';
+        $config['id_user'] = $server_uid;
         $correctLogin = true;
+        $config['is_admin'][$server_uid] = true;
         // Bypass credentials if server-auth and api-pass are correct.
     } else if (($config['server_unique_identifier'] === get_parameter('server_auth'))
         && ($api_password === $apiPassword)
         && ((bool) isInACL($ipOrigin) === true)
     ) {
-        $config['id_usuario'] = 'admin';
-        $config['id_user'] = 'admin';
+        $server_uid = get_parameter(('server_auth'));
+        $config['id_usuario'] = $server_uid;
+        $config['id_user'] = $server_uid;
+        $config['is_admin'][$server_uid] = true;
         $correctLogin = true;
     } else if ((bool) isInACL($ipOrigin) === true) {
         // External access.
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 64a95b778d..529684569d 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -66,13 +66,34 @@ global $config;
 // Care whit this!!! check_login not working if you remove this.
 $config['id_user'] = $id_user;
 $_SESSION['id_usuario'] = $id_user;
+
+// Checks for server api req.
+$bypassLogin = false;
+if ($data_decoded['apipass'] !== null
+    && ($config['server_unique_identifier'] === $_SESSION['id_usuario'])
+) {
+    $apiPassword = io_output_password(
+        db_get_value_filter(
+            'value',
+            'tconfig',
+            ['token' => 'api_password']
+        )
+    );
+
+
+    if ($apiPassword === $data_decoded['apipass']) {
+        $bypassLogin = true;
+    }
+}
+
 if (!isset($config[$slicebar])) {
     $config[$slicebar] = $slicebar_value;
 }
 
 // Try to initialize session using existing php session id.
 $user = new PandoraFMS\User(['phpsessionid' => $session_id]);
-if (check_login(false) === false) {
+
+if (check_login(false) === false && $bypassLogin !== true) {
     // Error handler.
     ?>
 <!DOCTYPE html>
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 353a17b80e..184e830e9c 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -1590,6 +1590,8 @@ class NetworkMap
     {
         global $config;
 
+        include_once 'include/functions_os.php';
+
         $return = [];
         $count_item_holding_area = 0;
         foreach ($nodes as $node) {
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 256b6399ee..f9aae123b2 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC231011';
+$build_version = 'PC231019';
 $pandora_version = 'v7.0NG.773.3';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 52409c14a6..d03b8d7412 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -4336,6 +4336,8 @@ function generator_chart_to_pdf(
             'id_user'          => $config['id_user'],
             'slicebar'         => $_SESSION['slicebar'],
             'slicebar_value'   => $config[$_SESSION['slicebar']],
+            'apipass'          => get_parameter('apipass', null),
+
         ];
     } else {
         $data = [
@@ -4345,6 +4347,7 @@ function generator_chart_to_pdf(
             'id_user'        => $config['id_user'],
             'slicebar'       => $_SESSION['slicebar'],
             'slicebar_value' => $config[$_SESSION['slicebar']],
+            'apipass'        => get_parameter('apipass', null),
         ];
     }
 
diff --git a/pandora_console/include/functions_cron_task.php b/pandora_console/include/functions_cron_task.php
index ffc5958d85..9de0520ccd 100644
--- a/pandora_console/include/functions_cron_task.php
+++ b/pandora_console/include/functions_cron_task.php
@@ -116,6 +116,7 @@ function cron_task_lock()
     return cron_lock('cron.lock');
 }
 
+
 /**
  * Release CRON.task lock
  *
@@ -130,6 +131,7 @@ function cron_task_release_lock()
     unlink($config['attachment_store'].'/cron.lock');
 }
 
+
 /**
  * Calculates target schedule time
  *
@@ -184,6 +186,7 @@ function cron_get_scheduled_time(
     return 0;
 }
 
+
 /**
  * Run scheduled task.
  *
@@ -506,7 +509,7 @@ function cron_task_start_gotty(bool $restart_mode=true)
     $startTime = time();
 
     // Workaround to wait until process inputs data in the log.
-    while (time() - $startTime < $maxWaitTime) {
+    while ((time() - $startTime) < $maxWaitTime) {
         if ($start_proc === true) {
             // Read command output.
             $log_content = file_get_contents($logFilePath);
diff --git a/pandora_console/include/functions_custom_fields.php b/pandora_console/include/functions_custom_fields.php
index 3632f9511c..9ce92a0c78 100644
--- a/pandora_console/include/functions_custom_fields.php
+++ b/pandora_console/include/functions_custom_fields.php
@@ -613,8 +613,198 @@ function agent_counters_custom_fields($filters)
 
         $final_result['indexed_descriptions'] = $data;
     } else {
-        // TODO.
-        $final_result = false;
+        $result_meta = [];
+        $data = [];
+
+        $query = sprintf(
+            "SELECT tcd.description AS name_data,
+                SUM(IF($agent_state_total, 1, 0)) AS a_agents,
+                SUM(IF($agent_state_critical, 1, 0)) AS a_critical,
+                SUM(IF($agent_state_warning, 1, 0)) AS a_warning,
+                SUM(IF($agent_state_unknown, 1, 0)) AS a_unknown,
+                SUM(IF($agent_state_normal, 1, 0)) AS a_normal,
+                SUM(IF($agent_state_notinit, 1, 0)) AS a_not_init,
+                SUM(tagent_counters.mm_normal) AS m_normal,
+                SUM(tagent_counters.mm_critical) AS m_critical,
+                SUM(tagent_counters.mm_warning) AS m_warning,
+                SUM(tagent_counters.mm_unknown) AS m_unknown,
+                SUM(tagent_counters.mm_not_init) AS m_not_init,
+                SUM(tagent_counters.mm_total) AS m_total
+            FROM tagent_custom_data tcd
+            INNER JOIN tagent_custom_fields tcf
+                ON tcd.id_field = tcf.id_field
+            INNER JOIN (
+                SELECT ta.id_agente,
+                    ta.total_count AS c_m_total,
+                    SUM( IF(tae.estado = 0, 1, 0) ) AS mm_normal,
+                    SUM( IF(tae.estado = 1, 1, 0) ) AS mm_critical,
+                    SUM( IF(tae.estado = 2, 1, 0) ) AS mm_warning,
+                    SUM( IF(tae.estado = 3, 1, 0) ) AS mm_unknown,
+                    SUM( IF(tae.estado = 4 OR tae.estado = 5, 1, 0) ) AS mm_not_init,
+                    COUNT(tam.id_agente_modulo) AS mm_total
+                FROM tagente ta
+                LEFT JOIN tagent_secondary_group tasg
+                    ON ta.id_agente = tasg.id_agent
+                INNER JOIN tagente_modulo tam
+                    ON ta.id_agente = tam.id_agente
+                INNER JOIN tagente_estado tae
+                    ON tam.id_agente = tae.id_agente
+                    AND tam.id_agente_modulo = tae.id_agente_modulo
+                WHERE ta.disabled = 0
+                    AND tam.disabled = 0
+                    %s
+                    %s
+                    %s
+                    %s
+                GROUP by ta.id_agente
+                    %s
+            ) AS tagent_counters
+                ON tcd.id_agent = tagent_counters.id_agente
+            INNER JOIN tagente ta
+                ON ta.id_agente = tagent_counters.id_agente
+            WHERE tcf.name = '%s'
+                AND tcd.description <> ''
+                %s
+            GROUP BY tcd.description",
+            $groups_and,
+            $and_status,
+            $and_module_search,
+            $and_module_status,
+            $empty_agents_count,
+            $custom_field_name,
+            $custom_data_and
+        );
+
+        $result_meta[] = db_get_all_rows_sql($query);
+
+        $query_data = sprintf(
+            "SELECT
+                tcd.description,
+                ta.id_agente,
+                %d AS id_server,
+                (CASE
+                    WHEN ta.critical_count > 0
+                        THEN 1
+                    WHEN ta.critical_count = 0
+                        AND ta.warning_count > 0
+                        THEN 2
+                    WHEN ta.critical_count = 0
+                        AND ta.warning_count = 0
+                        AND ta.unknown_count > 0
+                        THEN 3
+                    WHEN ta.critical_count = 0
+                        AND ta.warning_count = 0
+                        AND ta.unknown_count = 0
+                        AND ta.notinit_count <> ta.total_count
+                        THEN 0
+                    WHEN ta.total_count = ta.notinit_count
+                        THEN 5
+                    ELSE 0
+                END) AS `status`,
+                ta.critical_count,
+                ta.warning_count,
+                ta.unknown_count,
+                ta.notinit_count,
+                ta.normal_count,
+                ta.total_count
+            FROM tagente ta
+            LEFT JOIN tagent_secondary_group tasg
+                ON ta.id_agente = tasg.id_agent
+            INNER JOIN tagente_modulo tam
+                ON ta.id_agente = tam.id_agente
+            INNER JOIN tagente_estado tae
+                ON tam.id_agente = tae.id_agente
+                AND tam.id_agente_modulo = tae.id_agente_modulo
+            INNER JOIN tagent_custom_data tcd
+                ON tcd.id_agent = ta.id_agente
+            INNER JOIN tagent_custom_fields tcf
+                ON tcd.id_field = tcf.id_field
+            WHERE ta.disabled = 0
+                AND tcf.name = '%s'
+                AND tcd.description <> ''
+                AND tam.disabled = 0
+                %s
+                %s
+                %s
+                %s
+                %s
+                GROUP BY ta.id_agente
+            ",
+            $server_data['id'],
+            $custom_field_name,
+            $custom_data_and,
+            $groups_and,
+            $and_status,
+            $and_module_search,
+            $and_module_status
+        );
+
+        $node_result = db_get_all_rows_sql($query_data);
+        ;
+        if (empty($node_result)) {
+            $node_result = [];
+        }
+
+        $data = array_merge($data, $node_result);
+        $final_result = [];
+        $array_data = [];
+        if (isset($result_meta) && is_array($result_meta)) {
+            // Initialize counters.
+            $final_result['counters_total'] = [
+                't_m_normal'   => 0,
+                't_m_critical' => 0,
+                't_m_warning'  => 0,
+                't_m_unknown'  => 0,
+                't_m_not_init' => 0,
+                't_m_alerts'   => 0,
+                't_m_total'    => 0,
+                't_a_critical' => 0,
+                't_a_warning'  => 0,
+                't_a_unknown'  => 0,
+                't_a_normal'   => 0,
+                't_a_not_init' => 0,
+                't_a_agents'   => 0,
+            ];
+            foreach ($result_meta as $k => $nodo) {
+                if (isset($nodo) && is_array($nodo)) {
+                    foreach ($nodo as $key => $value) {
+                        // Sum counters total.
+                        $final_result['counters_total']['t_m_normal'] += $value['m_normal'];
+                        $final_result['counters_total']['t_m_critical'] += $value['m_critical'];
+                        $final_result['counters_total']['t_m_warning'] += $value['m_warning'];
+                        $final_result['counters_total']['t_m_unknown'] += $value['m_unknown'];
+                        $final_result['counters_total']['t_m_not_init'] += $value['m_not_init'];
+                        $final_result['counters_total']['t_m_alerts'] += $value['m_alerts'];
+                        $final_result['counters_total']['t_m_total'] += $value['m_total'];
+                        $final_result['counters_total']['t_a_critical'] += $value['a_critical'];
+                        $final_result['counters_total']['t_a_warning'] += $value['a_warning'];
+                        $final_result['counters_total']['t_a_unknown'] += $value['a_unknown'];
+                        $final_result['counters_total']['t_a_normal'] += $value['a_normal'];
+                        $final_result['counters_total']['t_a_not_init'] += $value['a_not_init'];
+                        $final_result['counters_total']['t_a_agents'] += $value['a_agents'];
+
+                        // Sum counters for data.
+                        $array_data[$value['name_data']]['m_normal'] += $value['m_normal'];
+                        $array_data[$value['name_data']]['m_critical'] += $value['m_critical'];
+                        $array_data[$value['name_data']]['m_warning'] += $value['m_warning'];
+                        $array_data[$value['name_data']]['m_unknown'] += $value['m_unknown'];
+                        $array_data[$value['name_data']]['m_not_init'] += $value['m_not_init'];
+                        $array_data[$value['name_data']]['m_alerts'] += $value['m_alerts'];
+                        $array_data[$value['name_data']]['m_total'] += $value['m_total'];
+                        $array_data[$value['name_data']]['a_critical'] += $value['a_critical'];
+                        $array_data[$value['name_data']]['a_warning'] += $value['a_warning'];
+                        $array_data[$value['name_data']]['a_unknown'] += $value['a_unknown'];
+                        $array_data[$value['name_data']]['a_normal'] += $value['a_normal'];
+                        $array_data[$value['name_data']]['a_not_init'] += $value['a_not_init'];
+                        $array_data[$value['name_data']]['a_agents'] += $value['a_agents'];
+                    }
+                }
+            }
+
+            $final_result['counters_name'] = $array_data;
+        }
+
+        $final_result['indexed_descriptions'] = $data;
     }
 
     return $final_result;
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 5fa9ec2a8d..f5115a73e9 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -4466,7 +4466,7 @@ function networkmap_get_new_nodes_and_links($networkmap, $x, $y)
                         'id_child'              => $child_node,
                         'id_parent_source_data' => $parent,
                         'id_child_source_data'  => $node['source_data'],
-                        'parent_type'           => 0,
+                        'parent_type'           => 2,
                         'child_type'            => 0,
                     ]
                 );
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 171f6c6b42..28b82739f3 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3612,10 +3612,20 @@ function ui_progress(
                         page: "'.$ajax['page'].'"
                     },
                     success: function(data) {
+                        let data_text = data;
+                        if (data.includes("script")) {
+                            const data_array = data_text.split("/script>");
+                            data = data_array[1];
+                        }
                         try {
                             val = JSON.parse(data);
+
                             $("#'.$id.'").attr("data-label", val + " %");
-                            $("#'.$id.'_progress").width(val+"%");';
+                            $("#'.$id.'_progress").width(val+"%");
+                            let parent_id = $("#'.$id.'").parent().parent().attr("id");
+                            if (val == 100) {
+                                $("#"+parent_id+"-5").html("'.__('Finish').'");
+                            }';
             if (isset($ajax['oncomplete'])) {
                 $output .= '
                             if (val == 100) {
diff --git a/pandora_console/include/javascript/extensions_discovery.js b/pandora_console/include/javascript/extensions_discovery.js
index a2cb6c85d0..15b8bfa60b 100644
--- a/pandora_console/include/javascript/extensions_discovery.js
+++ b/pandora_console/include/javascript/extensions_discovery.js
@@ -1,5 +1,10 @@
 /* global $, interval */
 $(document).ready(() => {
+  // Set close on select.
+  $("#_credentials_").select2({
+    closeOnSelect: true
+  });
+
   if (interval === "0") {
     setTimeout(() => {
       $("#mode_interval")
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index f47ea18740..c31216a2fc 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -2520,80 +2520,10 @@ function refresh_holding_area() {
 
 function refresh() {
   $("#spinner_networkmap").css("display", "flex");
-  var holding_pos_x = d3_nm.select("#holding_area_" + networkmap_id).attr("x");
-  var holding_pos_y = d3_nm.select("#holding_area_" + networkmap_id).attr("y");
-
-  var pos_x = parseInt(holding_pos_x) + parseInt(node_radius);
-  var pos_y = parseInt(holding_pos_y) + parseInt(node_radius);
-
-  var params = [];
-  params.push("refresh_holding_area=1");
-  params.push("id=" + networkmap_id);
-  params.push("x=" + pos_x);
-  params.push("y=" + pos_y);
-  params.push("page=operation/agentes/pandora_networkmap.view");
-  $.ajax({
-    data: {
-      page: "operation/agentes/pandora_networkmap.view",
-      refresh_holding_area: 1,
-      id: networkmap_id,
-      x: pos_x,
-      y: pos_y
-    },
-    dataType: "json",
-    type: "POST",
-    url: window.base_url_homedir + "/ajax.php",
-    success: function(data) {
-      if (data["correct"]) {
-        const array_nodes = data["holding_area"]["nodes"];
-        let array_links = data["holding_area"]["links"];
-        jQuery.each(graph.links, function(j, g_link) {
-          for (var i = 0; i < array_links.length; i++) {
-            if (g_link["id_db"] == array_links[i]["id_db"]) {
-              array_links.splice(i, 1);
-            }
-          }
-        });
-
-        let location = "";
-        if ($("#main").height()) {
-          location = `index.php?sec=network&sec2=operation/agentes/pandora_networkmap&tab=view&id_networkmap=${networkmap_id}`;
-        } else {
-          location = `index.php?sec=network&sec2=operation/agentes/pandora_networkmap&tab=view&pure=1&id_networkmap=${networkmap_id}`;
-        }
-
-        if (array_nodes.length === 0 && array_links.length === 0) {
-          update_networkmap();
-          $("#spinner_networkmap").css("display", "none");
-          window.location = location;
-        } else {
-          if (array_nodes.length > 0) {
-            $.ajax({
-              data: {
-                page: "operation/agentes/pandora_networkmap.view",
-                refresh_map: 1,
-                id: networkmap_id
-              },
-              dataType: "json",
-              type: "POST",
-              url: window.base_url_homedir + "/ajax.php",
-              success: function(data) {
-                $("#spinner_networkmap").css("display", "none");
-                window.location = location;
-              }
-            });
-          } else if (array_links.length > 0) {
-            $("#spinner_networkmap").css("display", "none");
-            window.location = location;
-          }
-        }
-      }
-    },
-    error: function(e) {
-      $("#spinner_networkmap").css("display", "none");
-      window.location = location;
-    }
-  });
+  refresh_holding_area();
+  update_networkmap();
+  $("#spinner_networkmap").css("display", "none");
+  window.location = location;
 }
 
 function startCountDown(duration) {
diff --git a/pandora_console/include/styles/js/datatables.min.css b/pandora_console/include/styles/js/datatables.min.css
index a9a1d5285c..c5a5598611 100644
--- a/pandora_console/include/styles/js/datatables.min.css
+++ b/pandora_console/include/styles/js/datatables.min.css
@@ -1822,10 +1822,7 @@ table.dataTable td {
 .dataTables_wrapper .dataTables_length {
   float: left;
 }
-.dataTables_wrapper .dataTables_filter {
-  float: right;
-  text-align: right;
-}
+
 .dataTables_wrapper .dataTables_filter input {
   margin-left: 0.5em;
 }
@@ -1875,8 +1872,8 @@ table.dataTable td {
 .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,
 .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active {
   cursor: default;
-  color: #666 !important;
-  border: 1px solid transparent;
+  color: #fff !important;
+  border: 1px solid #fff !important;
   background: transparent;
   box-shadow: none;
 }
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index f32241eb1a..154d98fc21 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -520,7 +520,6 @@ ul li {
   font-size: 14px;
   font-weight: normal;
   letter-spacing: -0.3px;
-  height: 18px;
 }
 .menu_icon_collapsed {
   background-position: 50% 50%;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 07b0e9df4b..847a6518cf 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -6781,7 +6781,7 @@ form#modal_form_feedback ul.wizard li > textarea {
 
 /* Generic classes to reuse and facilitate the creation of custom themes */
 .pandora_green_text {
-  color: #1d7873;
+  color: #82b92e;
 }
 
 .pandora_green_bg {
@@ -10323,7 +10323,7 @@ select:focus {
 }
 
 .dataTables_length > label {
-  font-size: 0px;
+  color: #fff;
 }
 
 input[type="button"],
@@ -12438,6 +12438,43 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
   width: 350px !important;
 }
 
+form.cfv_status_agent {
+  margin: 0 auto;
+  display: flex;
+  justify-content: space-around;
+}
+
+form.cfv_status_agent label {
+  display: block;
+  line-height: 35px;
+  height: 40px;
+  width: 19%;
+  -webkit-font-smoothing: antialiased;
+  margin-top: 10px;
+  color: #ffffff;
+  text-align: center;
+  cursor: pointer;
+  opacity: 0.3;
+  font-size: 13pt;
+}
+
+form.cfv_status_agent label img {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+
+form.cfv_status_agent input[type="checkbox"] {
+  display: none;
+}
+
+form.cfv_status_agent input:checked + label {
+  opacity: 1;
+}
+
+form.cfv_status_agent input:checked + label:before {
+  content: "✓ ";
+}
+
 .notificaion_menu_container {
   display: flex;
   padding-top: 10px;
@@ -12491,6 +12528,37 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
   vertical-align: middle;
 }
 
+/* --- Custom fields view --- */
+.custom_fields_view_layout {
+  margin-top: 15px;
+}
+
+.custom_fields_view {
+  width: 30%;
+  float: left;
+  margin-left: 10px;
+  padding-right: 10px;
+  max-height: 890px;
+  overflow: auto;
+  background-color: #f9f9f9;
+}
+
+.agents_custom_fields {
+  width: 100%;
+
+  margin-bottom: 15px;
+  padding: 25px 5px;
+}
+div.agents_custom_fields #datatables_wrapper div.top,
+div.agents_custom_fields #datatables_wrapper div.bottom {
+  background-color: #414141;
+  color: #ffffff;
+  border: none;
+  padding: 5px;
+  height: 38px;
+  width: 99%;
+}
+
 /*Horizontal tree*/
 
 .horizontal_tree-icon {
@@ -12520,6 +12588,36 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
   margin-top: 15px;
 }
 
+.custom_fields_view {
+  width: 30%;
+  float: left;
+  margin-left: 10px;
+  padding-right: 10px;
+  max-height: 890px;
+  overflow: auto;
+  background-color: #f9f9f9;
+}
+
+.agents_custom_fields {
+  width: 100%;
+
+  margin-bottom: 15px;
+  padding: 25px 5px;
+}
+div.agents_custom_fields #datatables_wrapper div.top,
+div.agents_custom_fields #datatables_wrapper div.bottom {
+  background-color: #414141;
+  color: #ffffff;
+  border: none;
+  padding: 5px;
+  height: 38px;
+  width: 99%;
+}
+
+.label_agent_service > label {
+  margin-top: 15px;
+}
+
 .animation-blink {
   -webkit-animation: glowing 1500ms infinite;
   -moz-animation: glowing 1500ms infinite;
@@ -12634,6 +12732,38 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
   justify-content: flex-start !important;
 }
 
+.dt-buttons {
+  width: auto;
+  position: absolute;
+  margin-left: 90px;
+}
+
+.title_tactical {
+  padding: 10px 0px 10px 0px;
+  text-align: center;
+  font-size: 12px;
+  line-height: 23px;
+  color: #000;
+  letter-spacing: 0.3pt;
+  font-family: "lato-bolder";
+  font-style: normal;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  font-weight: bold;
+}
+
+td.details-control {
+  background: url("../../images/darrowdown.png") no-repeat center center;
+  cursor: pointer;
+}
+tr.shown td.details-control {
+  background: url("../../images/darrowup.png") no-repeat center center;
+}
+
+.custom_field_data > tbody > tr > td:not(:first-child) {
+  text-align: center;
+}
+
 .ui-date-range-in > a {
   background-color: #81b92e3b !important;
 }
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 7d93624dbb..0e4879220a 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -364,13 +364,12 @@ a.pandora_pagination.current:hover {
   background-size: 22px;
   background-position: 48px center;
   background-repeat: no-repeat;
-  background-color: transparent;
+  background-color: #fff;
   color: var(--primary-color);
   font-size: 20px;
   height: 38px;
-  /* height: 32px; */
   width: 80px;
-  margin-left: 10px;
+  margin-left: 90px;
 
   display: flex;
   justify-content: space-between;
@@ -893,3 +892,19 @@ td.w75p#rightcolumn {
 #pending_alerts_paginate {
   margin-bottom: 15px;
 }
+
+.dataTables_filter > label {
+  color: #fff;
+}
+
+.dataTables_wrapper .dataTables_filter {
+  float: left;
+  text-align: right;
+  margin-left: 8%;
+  padding-left: 0px;
+  margin-top: -5px;
+}
+
+.dataTables_wrapper .dataTables_paginate .paginate_button {
+  background: #bcbcbc;
+}
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 9ab3666405..ae814c5443 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.773.3';
-            $build = '231011';
+            $build = '231019';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php
index 3dea327116..45d2fdfb67 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.editor.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php
@@ -473,7 +473,7 @@ if ($not_found) {
     );
 
     $table->data['source_data_group'][] = html_print_label_input_block(
-        __('Don\'t show subgroups:'),
+        __('Don&#39;t show subgroups:'),
         html_print_checkbox(
             'dont_show_subgroups',
             '1',
diff --git a/pandora_console/operation/custom_fields/custom_fields_view.php b/pandora_console/operation/custom_fields/custom_fields_view.php
new file mode 100644
index 0000000000..bd95ab26fd
--- /dev/null
+++ b/pandora_console/operation/custom_fields/custom_fields_view.php
@@ -0,0 +1,1271 @@
+<?php
+/**
+ * View for Custom Fields.
+ *
+ * @category   Custom fields
+ * @package    Pandora FMS
+ * @subpackage Enterprise
+ * @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;
+check_login();
+
+if (!check_acl($config['id_user'], 0, 'AR')) {
+    db_pandora_audit(
+        AUDIT_LOG_ACL_VIOLATION,
+        'Trying to access Inventory'
+    );
+    include 'general/noaccess.php';
+    return;
+}
+
+// Header.
+ui_print_standard_header(
+    __('Custom fields view'),
+    '',
+    false,
+    '',
+    false,
+    [],
+    [
+        [
+            'link'  => 'index.php?sec=estado&sec2=operation/custom_fields/custom_fields_view',
+            'label' => __('Monitoring'),
+        ],
+    ]
+);
+
+// =====================================================================
+// Includes
+// =====================================================================
+require_once 'include/functions_custom_fields.php';
+
+// =====================================================================
+// parameters
+// =====================================================================
+$info_user = get_user_info($config['id_user']);
+$group = get_parameter('group', 0);
+$id_custom_fields = get_parameter('id_custom_fields', 0);
+$id_custom_fields_data = get_parameter('id_custom_fields_data', -1);
+$id_status = get_parameter('id_status', AGENT_MODULE_STATUS_NOT_NORMAL);
+$module_search = get_parameter('module_search', '');
+$search = get_parameter('uptbutton', '');
+$id_filter = get_parameter('id_name', 0);
+$recursion = get_parameter('recursion', 0);
+$module_status = get_parameter('module_status', AGENT_MODULE_STATUS_NOT_NORMAL);
+
+// =====================================================================
+// Custom filter search
+// =====================================================================
+if ($search != 'Show') {
+    if ($id_filter || $info_user['default_custom_view']) {
+        if ($id_filter) {
+            $filter_array = array_shift(
+                get_filters_custom_fields_view($id_filter)
+            );
+        } else {
+            if ($info_user['default_custom_view']) {
+                $filter_array = array_shift(
+                    get_filters_custom_fields_view(
+                        $info_user['default_custom_view']
+                    )
+                );
+            }
+        }
+
+        $group = $filter_array['id_group'];
+        $id_custom_fields = io_safe_input($filter_array['id_custom_field']);
+        $id_custom_fields_data = json_decode(
+            $filter_array['id_custom_fields_data']
+        );
+        $id_status = json_decode($filter_array['id_status']);
+        $module_search = $filter_array['module_search'];
+        $recursion = $filter_array['recursion'];
+        $module_status = json_decode($filter_array['module_status']);
+    }
+}
+
+// =====================================================================
+// filters for search
+// =====================================================================
+$filters = [
+    'group'                 => $group,
+    'id_custom_fields'      => $id_custom_fields,
+    'id_custom_fields_data' => $id_custom_fields_data,
+    'id_status'             => $id_status,
+    'module_search'         => $module_search,
+    'module_status'         => $module_status,
+    'block_size'            => $config['block_size'],
+    'recursion'             => $recursion,
+];
+
+// =====================================================================
+// Table filters custom field
+// =====================================================================
+$table = new StdClass();
+$table->width = '100%';
+$table->class = 'databox filters';
+$table->data = [];
+$table->rowspan = [];
+$table->colspan = [];
+
+
+$array_custom_fields = get_custom_fields(false, true, true);
+
+if ($id_custom_fields) {
+    $array_custom_fields_data = get_custom_fields_data($id_custom_fields);
+} else {
+    $array_custom_fields_data = [];
+}
+
+$table->data[0][0] = __('Group');
+$table->data[0][1] = html_print_select_groups(
+    $config['id_user'],
+    'AR',
+    true,
+    'group',
+    $group,
+    '',
+    '',
+    '0',
+    true,
+    false,
+    false,
+    '',
+    false,
+    'width:180px;',
+    false,
+    false,
+    'id_grupo',
+    false
+);
+
+$table->data[0][2] = ' '.__('Recursion').' ';
+$table->data[0][3] = html_print_checkbox(
+    'recursion',
+    1,
+    $recursion,
+    true,
+    false,
+    ''
+);
+
+$array_status = [];
+$array_status[AGENT_MODULE_STATUS_NORMAL] = __('Normal');
+$array_status[AGENT_MODULE_STATUS_WARNING] = __('Warning');
+$array_status[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical');
+$array_status[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown');
+$array_status[AGENT_MODULE_STATUS_NOT_NORMAL] = __('Not normal');
+// Default.
+$array_status[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init');
+
+$table->data[1][0] = __('Status agents');
+$table->data[1][1] = html_print_select(
+    $array_status,
+    'id_status[]',
+    $id_status,
+    '',
+    __('All'),
+    -1,
+    true,
+    true,
+    true,
+    '',
+    false,
+    'min-width:150px'
+);
+
+$table->data[1][2] = __('Status module');
+$table->data[1][3] = html_print_select(
+    $array_status,
+    'module_status[]',
+    $module_status,
+    '',
+    __('All'),
+    -1,
+    true,
+    true,
+    true,
+    '',
+    false,
+    'min-width:150px'
+);
+
+$table->data[1][4] = '<div class="w100p left">';
+if ($info_user['is_admin']) {
+    $table->data[1][4] .= '<a href="javascript:"
+		onclick="dialog_filter_cf(\''.__('Save filter').'\', \'save\');">';
+    $table->data[1][4] .= html_print_image(
+        'images/disk.png',
+        true,
+        [
+            'border' => '0',
+            'title'  => __('Save filter'),
+            'alt'    => __('Save filter'),
+        ]
+    );
+    $table->data[1][4] .= '</a> &nbsp;';
+}
+
+$table->data[1][4] .= '<a href="javascript:"
+	onclick="dialog_filter_cf(\''.__('Load filter').'\', \'load\');">';
+$table->data[1][4] .= html_print_image(
+    'images/load.png',
+    true,
+    [
+        'border' => '0',
+        'title'  => __('Load filter'),
+        'alt'    => __('Load filter'),
+    ]
+);
+$table->data[1][4] .= '</a> &nbsp;';
+
+$table->data[1][4] .= '</div>';
+
+$table->data[2][0] = __('Custom Fields');
+$table->data[2][1] = html_print_select(
+    $array_custom_fields,
+    'id_custom_fields',
+    $id_custom_fields,
+    '',
+    __('None'),
+    0,
+    true,
+    false,
+    true,
+    '',
+    false,
+    'width:10em'
+);
+
+$table->data[2][2] = __('Custom Fields Data');
+$table->data[2][3] = html_print_select(
+    $array_custom_fields_data,
+    'id_custom_fields_data[]',
+    io_safe_output($id_custom_fields_data),
+    'set_custom_fields_data_title()',
+    __('All'),
+    -1,
+    true,
+    true,
+    true,
+    '',
+    false,
+    'min-width:150px;',
+    false,
+    false,
+    false,
+    '',
+    false,
+    true,
+    false,
+    false,
+    true,
+    true
+);
+
+$table->colspan[3][1] = 3;
+$table->data[3][0] = __('Module search');
+$table->data[3][1] = html_print_input_text(
+    'module_search',
+    $module_search,
+    '',
+    20,
+    40,
+    true
+);
+
+$table->data[2][5] = html_print_submit_button(
+    __('Show'),
+    'uptbutton',
+    false,
+    'class="sub search mgn_tp_0"',
+    true
+);
+
+if (check_acl($config['id_user'], 0, 'PM')) {
+    // Pass the parameters to the page that generates the csv file (arrays)
+    $decode_id_status = base64_encode(json_encode($id_status));
+    $decode_module_status = base64_encode(json_encode($module_status));
+    $decode_filters = base64_encode(json_encode($filters));
+
+    $table->data[3][5] = '<div style="display: inline;">';
+    /*
+        $table->data[3][5] .= html_print_button(
+        __('Export to CSV'),
+        'csv_export',
+        false,
+        "blockResubmit($(this)); location.href='monitoring/custom_fields_csv.php?filters=$decode_filters&id_custom_field=$id_custom_fields&id_status=$decode_id_status&module_status=$decode_module_status'",
+        'class="sub next"',
+        true
+    );*/
+    $table->data[3][5] .= '</div>';
+}
+
+
+$form = '<form method="post" action="">';
+    $form .= html_print_table($table, true);
+$form .= '</form>';
+
+ui_toggle(
+    $form,
+    '<span class="subsection_header_title">'.__('Filters').'</span>',
+    'filters',
+    false,
+    true,
+    false,
+    '',
+    'white-box-content',
+    'box-flat white_table_graph fixed_filter_bar'
+);
+
+// =====================================================================
+// div for show success messages
+// =====================================================================
+echo "<div id='msg_success'> </div>";
+
+
+// Image for gif datatables processing.
+$processing = html_print_image(
+    'images/spinner.gif',
+    true,
+    [
+        'title' => __('Processing'),
+    ]
+).'<span>'.__('Processing').'...</span>';
+
+if (isset($id_custom_fields_data) && is_array($id_custom_fields_data)) {
+    $data = agent_counters_custom_fields($filters);
+
+    if (!empty($data['indexed_descriptions'])) {
+        echo "<div class='custom_fields_view_layout'>";
+            echo "<div class='custom_fields_view'>";
+
+        if (in_array(-1, $filters['id_custom_fields_data'])) {
+            $id_custom_field_array = get_custom_fields_data($id_custom_fields);
+        } else {
+            $id_custom_field_array = $filters['id_custom_fields_data'];
+        }
+
+        foreach ($id_custom_field_array as $value) {
+            /*
+                $table_agent = html_get_predefined_table();
+                $table_agent->style = [];
+            $table_agent->class = 'tactical_view';*/
+
+            $table_agent = new StdClass();
+            $table_agent->width = '100%';
+            $table_agent->class = 'tactical_view';
+            $table_agent->data = [];
+            $table_agent->rowspan = [];
+            $table_agent->colspan = [];
+
+            $agent_data = [];
+
+            // Critical.
+            $agent_data[0] = html_print_image(
+                'images/agent_critical.png',
+                true,
+                ['title' => __('Agents critical')]
+            );
+            $agent_data[1] = "<a style='color: ".COL_CRITICAL.";' href='#'>";
+            $agent_data[1] .= "<b><span class='font_12pt bolder red_color '>";
+            $agent_data[1] .= format_numeric(
+                $data['counters_name'][$value]['a_critical']
+            );
+            $agent_data[1] .= '</span></b></a>';
+
+            // Warning.
+            $agent_data[2] = html_print_image(
+                'images/agent_warning.png',
+                true,
+                ['title' => __('Agents warning')]
+            );
+            $agent_data[3] = "<a style='color: ".COL_WARNING.";' href='#'>";
+            $agent_data[3] .= "<b><span class='font_12pt bolder yellow_color'>";
+            $agent_data[3] .= format_numeric(
+                $data['counters_name'][$value]['a_warning']
+            );
+            $agent_data[3] .= '</span></b></a>';
+
+            // OK.
+            $agent_data[4] = html_print_image(
+                'images/agent_ok.png',
+                true,
+                ['title' => __('Agents ok')]
+            );
+            $agent_data[5] = "<a style='color: ".COL_NORMAL.";' href='#'>";
+            $agent_data[5] .= "<b><span class='font_12pt bolder pandora_green_text'>";
+            $agent_data[5] .= format_numeric(
+                $data['counters_name'][$value]['a_normal']
+            );
+            $agent_data[5] .= '</span></b></a>';
+
+            // Unknown.
+            $agent_data[6] = html_print_image(
+                'images/agent_unknown.png',
+                true,
+                ['title' => __('Agents unknown')]
+            );
+            $agent_data[7] = "<a style='color: ".COL_UNKNOWN.";' href='#'>";
+            $agent_data[7] .= "<b><span class='font_12pt bolder grey_color'>";
+            $agent_data[7] .= format_numeric(
+                $data['counters_name'][$value]['a_unknown']
+            );
+            $agent_data[7] .= '</span></b></a>';
+
+            // Not init.
+            $agent_data[8] = html_print_image(
+                'images/agent_notinit.png',
+                true,
+                ['title' => __('Agents not init')]
+            );
+            $agent_data[9] = "<a style='color: ".COL_NOTINIT.";' href='#'>";
+            $agent_data[9] .= "<b><span class='font_12pt bolder blue_color'>";
+            $agent_data[9] .= format_numeric(
+                $data['counters_name'][$value]['a_not_init']
+            );
+            $agent_data[9] .= '</span></b></a>';
+
+            $table_agent->data[] = $agent_data;
+
+            $m_critical = ($data['counters_name'][$value]['m_critical'] <= 0) ? '0' : $data['counters_name'][$value]['m_critical'];
+            $m_warning = ($data['counters_name'][$value]['m_warning'] <= 0) ? '0' : $data['counters_name'][$value]['m_warning'];
+            $m_normal = ($data['counters_name'][$value]['m_normal'] <= 0) ? '0' : $data['counters_name'][$value]['m_normal'];
+            $m_unknown = ($data['counters_name'][$value]['m_unknown'] <= 0) ? '0' : $data['counters_name'][$value]['m_unknown'];
+            $m_not_init = ($data['counters_name'][$value]['m_not_init'] <= 0) ? '0' : $data['counters_name'][$value]['m_not_init'];
+
+            // Modules by status table.
+            /*
+                $table_mbs = html_get_predefined_table();
+                $table_mbs->class = 'tactical_view';
+            $table_mbs->style = [];*/
+
+            $table_mbs = new StdClass();
+            $table_mbs->width = '100%';
+            $table_mbs->class = 'tactical_view';
+            $table_mbs->data = [];
+            $table_mbs->rowspan = [];
+            $table_mbs->colspan = [];
+
+            $tdata = [];
+            $tdata[0] = html_print_image(
+                'images/module_critical.png',
+                true,
+                ['title' => __('Monitor critical')],
+                false,
+                false,
+                false,
+                true
+            );
+            $tdata[1] = '<a style="color: '.COL_CRITICAL.';" class="font_12pt bolder" href="#">'.$m_critical.'</a>';
+
+            $tdata[2] = html_print_image(
+                'images/module_warning.png',
+                true,
+                ['title' => __('Monitor warning')],
+                false,
+                false,
+                false,
+                true
+            );
+            $tdata[3] = '<a style="color: '.COL_WARNING_DARK.';" class="font_12pt bolder" href="#">'.$m_warning.'</a>';
+
+            $tdata[4] = html_print_image(
+                'images/module_ok.png',
+                true,
+                ['title' => __('Monitor normal')],
+                false,
+                false,
+                false,
+                true
+            );
+            $tdata[5] = '<a style="color: '.COL_NORMAL.';" class="font_12pt bolder" href="#">'.$m_normal.'</a>';
+
+            $tdata[6] = html_print_image(
+                'images/module_unknown.png',
+                true,
+                ['title' => __('Monitor unknown')],
+                false,
+                false,
+                false,
+                true
+            );
+            $tdata[7] = '<a style="color: '.COL_UNKNOWN.';" class="font_12pt bolder" href="#">'.$m_unknown.'</a>';
+
+            $tdata[8] = html_print_image(
+                'images/module_notinit.png',
+                true,
+                ['title' => __('Monitor not init')],
+                false,
+                false,
+                false,
+                true
+            );
+
+            $tdata[9] = '<a style="color: '.COL_NOTINIT.';" class="font_12pt bolder" href="#">'.$m_not_init.'</a>';
+
+            $table_mbs->data[] = $tdata;
+
+                echo "<div class='title_tactical'>".ui_bbcode_to_html($value).'</div>';
+                // Agents data.
+                echo '<div>';
+                    echo "<fieldset class='tactical_set'>";
+                        echo '<legend>'.__('Agents by status').': '.$data['counters_name'][$value]['a_agents'].'</legend>';
+                        echo html_print_table($table_agent, true);
+                    echo '</fieldset>';
+                echo '</div>';
+
+                // Modules data.
+                echo "<div class='tactical_div_end'>";
+                    echo "<fieldset class='tactical_set'>";
+                        echo '<legend>'.__('Monitors by status').': '.$data['counters_name'][$value]['m_total'].'</legend>';
+                        echo html_print_table($table_mbs, true);
+                    echo '</fieldset>';
+                echo '</div>';
+        }
+
+        echo '</div>';
+        // Agent status.
+        $status_agent_array = [
+            1 => [
+                'value'   => 'AGENT_STATUS_CRITICAL',
+                'checked' => 1,
+                'image'   => 'images/agent_mc.menu-2.png',
+                'title'   => __('Critical agents'),
+                'color'   => '#e63c52',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_a_critical']
+                ),
+            ],
+            2 => [
+                'value'   => 'AGENT_STATUS_WARNING',
+                'checked' => 1,
+                'image'   => 'images/agent_mc.menu-2.png',
+                'title'   => __('Warning agents'),
+                'color'   => '#f3b200',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_a_warning']
+                ),
+            ],
+            0 => [
+                'value'   => 'AGENT_STATUS_NORMAL',
+                'checked' => 1,
+                'image'   => 'images/agent_mc.menu-2.png',
+                'title'   => __('Normal agents'),
+                'color'   => '#82b92e',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_a_normal']
+                ),
+            ],
+            3 => [
+                'value'   => 'AGENT_STATUS_UNKNOWN',
+                'checked' => 1,
+                'image'   => 'images/agent_mc.menu-2.png',
+                'title'   => __('Unknown agents'),
+                'color'   => '#B2B2B2',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_a_unknown']
+                ),
+            ],
+            5 => [
+                'value'   => 'AGENT_STATUS_NOT_INIT',
+                'checked' => 1,
+                'image'   => 'images/agent_mc.menu-2.png',
+                'title'   => __('Not init agents'),
+                'color'   => '#60aae9',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_a_not_init']
+                ),
+            ],
+        ];
+
+        if (isset($filters['id_status']) === true && is_array($filters['id_status']) === true) {
+            if (in_array(-1, $filters['id_status']) === false) {
+                if (in_array(AGENT_MODULE_STATUS_NOT_NORMAL, $filters['id_status']) === false) {
+                    foreach ($status_agent_array as $key => $value) {
+                        if (in_array($key, $filters['id_status']) === false) {
+                            $status_agent_array[$key]['checked'] = 0;
+                        }
+                    }
+                } else {
+                    // Not normal statuses.
+                    $status_agent_array[0]['checked'] = 0;
+                }
+            }
+        }
+
+        // Module status.
+        $status_module_array = [
+            1 => [
+                'value'   => 'AGENT_STATUS_CRITICAL',
+                'checked' => 1,
+                'image'   => 'images/module_event_ok.png',
+                'title'   => __('Critical modules'),
+                'color'   => '#e63c52',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_m_critical']
+                ),
+                'class'   => 'line_heigth_0pt',
+            ],
+            2 => [
+                'value'   => 'AGENT_STATUS_WARNING',
+                'checked' => 1,
+                'image'   => 'images/module_event_ok.png',
+                'title'   => __('Warning modules'),
+                'color'   => '#f3b200',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_m_warning']
+                ),
+                'class'   => 'line_heigth_0pt',
+            ],
+            0 => [
+                'value'   => 'AGENT_STATUS_NORMAL',
+                'checked' => 1,
+                'image'   => 'images/module_event_ok.png',
+                'title'   => __('Normal modules'),
+                'color'   => '#82b92e',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_m_normal']
+                ),
+                'class'   => 'line_heigth_0pt',
+            ],
+            3 => [
+                'value'   => 'AGENT_STATUS_UNKNOWN',
+                'checked' => 1,
+                'image'   => 'images/module_event_ok.png',
+                'title'   => __('Unknown modules'),
+                'color'   => '#B2B2B2',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_m_unknown']
+                ),
+                'class'   => 'line_heigth_0pt',
+            ],
+            5 => [
+                'value'   => 'AGENT_STATUS_NOT_INIT',
+                'checked' => 1,
+                'image'   => 'images/module_event_ok.png',
+                'title'   => __('Not init modules'),
+                'color'   => '#60aae9',
+                'counter' => format_numeric(
+                    $data['counters_total']['t_m_not_init']
+                ),
+                'class'   => 'line_heigth_0pt',
+            ],
+        ];
+
+        if (isset($filters['module_status']) === true && is_array($filters['module_status']) === true) {
+            if (in_array(-1, $filters['module_status']) === false) {
+                if (in_array(AGENT_MODULE_STATUS_NOT_NORMAL, $filters['module_status']) === false) {
+                    foreach ($status_module_array as $key => $value) {
+                        if (in_array($key, $filters['module_status']) === false) {
+                            $status_module_array[$key]['checked'] = 0;
+                        }
+                    }
+                } else {
+                    // Not normal statuses.
+                    $status_module_array[0]['checked'] = 0;
+                }
+            }
+        }
+
+        // Total status.
+        echo "<div class='state_events'>";
+            echo "<div class='title_tactical'>".__('Total counters').'</div>';
+
+            echo "<fieldset class='tactical_set'>";
+                echo '<legend>'.__('Total Agents').'</legend>';
+                echo print_counters_cfv(
+                    $status_agent_array,
+                    'form-agent-counters',
+                    'agents'
+                );
+            echo '</fieldset>';
+
+            echo "<fieldset class='tactical_set'>";
+                echo '<legend>'.__('Total Modules').'</legend>';
+                echo print_counters_cfv(
+                    $status_module_array,
+                    'form-module-counters',
+                    'modules'
+                );
+            echo '</fieldset>';
+
+        echo '</div>';
+
+        echo "<div class='agents_custom_fields '>";
+            echo "<table id='datatables' class='display w100pi'>";
+                echo '<thead>';
+                    echo '<tr>';
+                        echo '<th></th>';
+                        echo '<th>'.$array_custom_fields[$id_custom_fields].'</th>';
+                        echo '<th>'.__('Agent').'</th>';
+                        echo '<th>'.__('I.P').'</th>';
+                        echo '<th>'.__('Server').'</th>';
+                        echo '<th>'.__('Status').'</th>';
+                    echo '</tr>';
+                echo '</thead>';
+                echo '<tbody>';
+                    // Content of the dynamically created load.
+                echo '</tbody>';
+            echo '</table>';
+        echo '</div>';
+
+        echo '</div>';
+
+        $indexed_descriptions = $data['indexed_descriptions'];
+    } else {
+        ui_print_info_message(
+            [
+                'no_close' => true,
+                'message'  => __('No data to show.'),
+            ]
+        );
+    }
+} else {
+    ui_print_info_message(
+        [
+            'no_close' => true,
+            'message'  => __('There are no custom search defined.'),
+        ]
+    );
+}
+
+// Div modal for display filters.
+echo '<div id="filter_cf" class="invisible"></div>';
+
+ui_require_css_file('datatables.min', 'include/styles/js/');
+ui_require_javascript_file_enterprise('functions_csv');
+ui_require_javascript_file('datatables.min');
+ui_require_javascript_file('buttons.dataTables.min');
+ui_require_javascript_file('dataTables.buttons.min');
+ui_require_javascript_file('buttons.html5.min');
+ui_require_javascript_file('buttons.print.min');
+enterprise_include_once('include/functions_reporting_csv.php');
+?>
+
+<script type='text/javascript'>
+$(document).ready (function () {
+    $("#id_custom_fields").on('change', function(e){
+        var name_custom_fields = $("#id_custom_fields").val();
+        $.ajax({
+            type: "POST",
+            url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+            data: "page=include/ajax/custom_fields&get_custom_fields_data=1&name_custom_fields="+name_custom_fields,
+            dataType: "json",
+            success: function(data) {
+                $("#id_custom_fields_data")
+                    .find('option')
+                    .remove();
+
+                $("#id_custom_fields_data")
+                    .append('<option value="-1">' +'<?php echo __('All'); ?>' + '</option>');
+
+                $("#id_custom_fields_data [value='-1']").attr("selected", true);
+
+                $.each(data, function(index, element){
+                    $("#id_custom_fields_data")
+                        .append('<option value="'+ index +'">'+ element +'</option>');
+                });
+            }
+        });
+    });
+
+    var filters = '<?php echo json_encode($filters); ?>';
+    var indexed_descriptions = '<?php echo json_encode($indexed_descriptions); ?>';
+    var processing = '<?php echo $processing; ?>';
+
+    table_datatables(filters, indexed_descriptions, processing);
+
+    $('#form-agent-counters input').on( 'click', function () {
+        cf_status_change(filters, indexed_descriptions, processing);
+    });
+
+    $('#form-module-counters input').on( 'click', function () {
+        cf_status_change(filters, indexed_descriptions, processing); 
+    });
+
+    $('#datatables tbody').on( 'click', 'tr td.details-control', function () {
+        var tr = $(this).closest('tr');
+        var row = table.row( tr );
+
+        if ( row.child.isShown() ) {
+            // This row is already open - close it
+            row.child.hide();
+            tr.removeClass('shown');
+        }
+        else {
+            // Open this row
+            row.child( build_table_child(row.data(), filters, processing) ).show();
+            tr.addClass('shown');
+        }
+    });  
+
+    set_custom_fields_data_title();
+});
+
+/**
+ * Create dialog
+ */
+function dialog_filter_cf(title, type_form){
+    if (type_form == 'load') {
+        $("#filter_cf").dialog ({
+            title: title,
+            resizable: true,
+            draggable: true,
+            modal: true,
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 688,
+            height: 200
+        })
+        .show ();
+    } else {
+        $("#filter_cf").dialog ({
+            title: title,
+            resizable: true,
+            draggable: true,
+            modal: true,
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 688,
+            height: 350
+        })
+        .show ();
+    }
+
+    $("#filter_cf").empty();
+
+    $.ajax({
+        type: "POST",
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        data: "page=include/ajax/custom_fields&build_table_save_filter=1&type_form="+type_form,
+        dataType: "html",
+        success: function(data) {
+            $("#filter_cf").append(data);
+            var filters = {};
+            filters.id = "extended_create_filter";
+            filters.group = $("#group").val();
+            filters.id_custom_fields_data = $("#id_custom_fields_data").val();
+            filters.id_status = $("#id_status").val();
+            filters.id_custom_fields = $("#id_custom_fields").val();
+            filters.module_search = $("#text-module_search").val();
+            filters.recursion = $("#checkbox-recursion").is(':checked') ? 1 : 0;
+            filters.module_status = $("#module_status").val();
+
+            if(type_form == 'save'){
+                $("#tabs").tabs({});
+
+                append_tab_filter(filters);
+
+                $("#tabs ul li a").on('click', function(e){
+                    var filters = {};
+                    filters.id = "extended_create_filter";
+                    filters.group = $("#group").val();
+                    filters.id_custom_fields_data = $("#id_custom_fields_data").val();
+                    filters.id_status = $("#id_status").val();
+                    filters.id_custom_fields = $("#id_custom_fields").val();
+                    filters.module_search = $("#text-module_search").val();
+                    filters.recursion = $("#checkbox-recursion").is(':checked');
+                    filters.module_status = $("#module_status").val();
+
+                    if(this.id == 'link_update'){
+                        filters['id'] = "extended_update_filter";
+                    }
+                    append_tab_filter(filters);
+                });
+            }
+        }
+    });
+}
+
+function table_datatables(filters, indexed_descriptions, processing){
+    console.log(indexed_descriptions);
+    array_data = JSON.parse(filters);
+    table = $('#datatables').DataTable({
+        processing: true,
+        serverSide: true,
+        lengthChange: true,
+        searching: true,
+        pageLength: Number(array_data.block_size),
+        lengthMenu: [ 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 75, 100],
+        //buttons: [{ extend: 'csvHtml5', text: 'Save as csvHtml5' }],
+        responsive: false,
+        ajax: {
+            type: "POST",
+            url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+            dataType: "json",
+            data: {
+                'page': 'include/ajax/custom_fields',
+                'build_table_custom_fields': 1,
+                'group': array_data.group,
+                'id_custom_fields': array_data.id_custom_fields,
+                'id_custom_fields_data': array_data.id_custom_fields_data,
+                'id_status': array_data.id_status,
+                'module_search': array_data.module_search,
+                'recursion': array_data.recursion,
+                'module_status': array_data.module_status,
+                'indexed_descriptions': indexed_descriptions,
+                'paging': true,
+                'ordering': true,
+                'scrollX': true,
+                'scroller': true
+            },
+        },
+        language: {
+            processing: processing,
+            lengthMenu: "Show _MENU_ items per page",
+            zeroRecords: "Nothing found. Please change your search term",
+            //info: "Page _PAGE_ of _PAGES_",
+            infoEmpty: "No results",
+            infoFiltered: "",
+            search: "Search:",
+            /*paginate:{
+                next: "Next",
+                previous: "Next"
+            }*/
+        },
+        sDom: '<"top"lfp>rt<"bottom"ip><"clear">',
+        columns: [
+            {
+                className: 'details-control',
+                orderable: false,
+                data: null,
+                defaultContent: '',
+                width: '5%'
+            },
+            {
+                orderable: true,
+                data: "data_custom_field"
+            },
+            {
+                orderable: true,
+                data: "agent",
+                render: function (data, type, row) {
+                    if (type === "exportcsv") {
+                        const title = data.match(/title="(.*)"/i);
+                        if (title != null) {
+                            return title[1];
+                        }
+                    }
+                    return data;
+                }
+            },
+            {
+                orderable: true,
+                data: "IP"
+            },
+            {
+                orderable: true,
+                data: "server"
+            },
+            {
+                orderable: false,
+                data: "status",
+                render: function (data, type, row) {
+                    // In the future, try to use the column "status_value".
+                   if (type === "exportcsv") {
+                        var status_string;
+                        if (data.indexOf("agent_warning.png") > -1) {
+                            status_string = 'Warning';
+                        } else if (data.indexOf("agent_critical.png") > -1){
+                            status_string = 'Critical';
+                        } else if (data.indexOf("agent_ok.png") > -1){
+                            status_string = 'Normal';
+                        } else if (data.indexOf("agent_down.png") > -1){
+                            status_string = 'Unknown';
+                        } else if (data.indexOf("init") > -1){
+                            status_string = 'Not init';
+                        } else{
+                            status_string = 'Normal';
+                        }
+                        return status_string;
+                    }
+                    return data;
+                },
+                width: '10%'
+            }
+        ],
+        order: [
+            [ 1, "desc" ]
+        ]
+    });
+    
+    $.ajax ({
+        url : "ajax.php",
+        data : {
+            'page': 'include/ajax/custom_fields',
+            'check_csv_button': 1
+            },
+        type : 'POST',
+        dataType : 'json',
+        success: function (data) { 
+            // Create button to export csv when table exists.
+            if($.fn.DataTable.isDataTable('#datatables')) {
+                new $.fn.dataTable.Buttons( table, {
+                    name: 'commands',
+                    buttons: 
+                    [
+                        { 
+                            extend: 'csvHtml5', 
+                            text: 'Save as CSV', 
+                            itle: 'custom_fields_current_view',
+                            fieldSeparator: "<?php echo $config['csv_divider']; ?>",
+                            fieldBoundary: '',
+                            action: function ( e, dt, node, config ) {
+                                blockResubmit(node);
+                                // Call the default csvHtml5 action method to create the CSV file
+                                $.fn.dataTable.ext.buttons.csvHtml5.action.call(this, e, dt, node, config);
+                            },
+                            exportOptions: {
+                                columns: [1,2,3,4,5],
+                                orthogonal: "exportcsv",
+                                format: {
+                                    body: function(data, row, column, node) {
+                                        data = $('<p>' + data + '</p>').text();
+                                            if($.isNumeric(data)) {
+                                                var countDecimals = function(value) {
+                                                    if (Math.floor(value) !== value) {
+                                                        return value.toString().split(".")[1].length || 0;
+                                                    }
+
+                                                    return 0;
+                                                }
+                                                var dec_point = "<?php echo $config['csv_decimal_separator']; ?>";
+                                                var thousands_separator = "<?php echo __(''); ?>";
+                                                data = js_csv_format_numeric(data ,dec_point, thousands_separator, countDecimals(data));
+                                            }
+                                            return data;
+                                    }
+                                },
+                            },
+                            className: 'button_save_csv' 
+                        }
+                    ],               
+                });
+
+                table.buttons( 0, null ).containers().insertBefore( '#datatables_paginate' );
+                // Enable Export All csv button, when the table has data (filters are charged).
+                $("#button-csv_export").prop("disabled",false).css('cursor','pointer');
+            } else {   
+                // Disable Export All csv button, because it is empty.   
+                $("#button-csv_export").prop("disabled",true).css('cursor','not-allowed');
+            }
+        }
+    });
+}
+
+function build_table_child (d, filters, processing) {
+    array_data = JSON.parse(filters);
+    
+    var filters_modules = $('#form-module-counters').serializeArray();
+    var status_modules = filters_modules.map(
+        name => name.name.replace(/lists_modules\[/g,'').replace(/\]/g,'')
+    );
+
+    var data = {
+        'page': 'include/ajax/custom_fields',
+        'build_table_child_custom_fields': true,
+        'id_agent': d.id_agent,
+        'id_server': d.id_server,
+        'module_search': array_data.module_search,
+        'module_status': status_modules
+    }
+
+    var div_table = $('<div>').append(processing);
+
+    $.ajax({
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        type: 'POST',
+        dataType: 'json',
+        data: data,
+        success: function(data){
+            div_table.empty();
+            div_table.append(data.modules_table);
+            $('#reload_status_agent_'+d.id_server+'_'+d.id_agent).empty();
+            $('#reload_status_agent_'+d.id_server+'_'+d.id_agent).append(data.img_status_agent);
+        }
+    });
+
+    return div_table;
+}
+
+/**
+ * Action filters custom fileds view
+ */
+function append_tab_filter(filters){
+    //convert to JSON
+    filters_string = JSON.stringify(filters);
+    //clean div
+    $("#"+filters['id']).empty();
+
+    //execute actions
+    $.ajax({
+        type: "POST",
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        data: "page=include/ajax/custom_fields&append_tab_filter=1&filters="+filters_string,
+        dataType: "html",
+        success: function(data) {
+            //clean divs errors
+            $("#msg_success").empty();
+
+            //filters
+            $("#"+filters['id']).append(data);
+
+            //action create
+            $('#button-create_filter').on('click', function(){
+                name = $('#text-id_name').val();
+                group_search = $('#group_search_cr').val();
+                $.ajax({
+                    type: "POST",
+                    url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+                    data: "page=include/ajax/custom_fields&create_filter_cf=1&filters="+filters_string+"&name_filter="+name+"&group_search="+group_search,
+                    dataType: "json",
+                    success: function(data) {
+                        //clean divs errors
+                        $("#msg_error_create").empty();
+                        if(data.error){
+                            $("#msg_error_create").append(data.msg);
+                        }
+                        else{
+                            $("#msg_success").append(data.msg);
+                            $("#filter_cf").dialog('close');
+                        }
+                    }
+                });
+            });
+
+            //action update
+            $('#button-update_filter').on('click', function(){
+                id = $('#id_name').val();
+                group_search = $('#group_search_up').val();
+                $.ajax({
+                    type: "POST",
+                    url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+                    data: "page=include/ajax/custom_fields&update_filter_cf=1&filters="+filters_string+"&id_filter="+id+"&group_search="+group_search,
+                    dataType: "json",
+                    success: function(data) {
+                        //clean divs errors
+                        $("#msg_error_update").empty();
+
+                        if(data.error){
+                            $("#msg_error_update").append(data.msg);
+                        }
+                        else{
+                            $("#msg_success").append(data.msg);
+                            $("#filter_cf").dialog('close');
+                        }
+                    }
+                });
+            });
+
+            //delete update
+            $('#button-delete_filter').on('click', function(){
+
+                //dialog confirm
+                display_confirm_dialog(
+                    "<?php echo __('Are you sure?'); ?>",
+                    "<?php echo __('Confirm'); ?>",
+                    "<?php echo __('Cancel'); ?>",
+                    function () {
+                        id = $('#id_name').val();
+                        //delete if confirm
+                        $.ajax({
+                            type: "POST",
+                            url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+                            data: "page=include/ajax/custom_fields&delete_filter_cf=1&filters="+filters_string+"&id_filter="+id,
+                            dataType: "json",
+                            success: function(data) {
+                                //clean divs errors
+                                $("#msg_error_delete").empty();
+
+                                if(data.error){
+                                    $("#msg_error_delete").append(data.msg);
+                                }
+                                else{
+                                    $("#msg_success").append(data.msg);
+                                    $("#filter_cf").dialog('close');
+                                }
+                            }
+                        });
+                        return false;
+                    }
+                );
+            });
+        }
+    });
+}
+
+function filter_name_change_group(val){
+    $.ajax({
+        type: "POST",
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        data: "page=include/ajax/custom_fields&change_name_filter=1&id_filter="+val,
+        dataType: "json",
+        success: function(data) {
+            $('#group_search_up option[value="'+data.group_search+'"]').attr("selected",true);
+        }
+    });
+}
+
+function cf_status_change(filters, indexed_descriptions, processing){
+    var filters_agents = $('#form-agent-counters').serializeArray();
+    var status_agents = filters_agents.map(
+        name => name.name.replace(/lists_agents\[/g,'').replace(/\]/g,'')
+    );
+
+    var filters_modules = $('#form-module-counters').serializeArray();
+    var status_modules = filters_modules.map(
+        name => name.name.replace(/lists_modules\[/g,'').replace(/\]/g,'')
+    );
+
+    // Convert json to object.
+    var array_filters = JSON.parse(filters);
+
+    // Add new filters.
+    array_filters['id_status'] = status_agents;
+    array_filters['module_status'] = status_modules;
+
+    // Convert to string.
+    var filters_string = JSON.stringify(array_filters);
+
+    // Clear table.
+    table.destroy();
+
+    // Add new table with new filter.
+    table_datatables(filters_string, indexed_descriptions, processing);
+}
+
+function set_custom_fields_data_title()
+{
+    $('#id_custom_fields_data > option').each(function() {
+       var text = $(this).text();
+       $(this).attr('title', text);
+    });
+}
+
+</script>
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 7c04359f98..0bec0e65d8 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -32,6 +32,7 @@ require_once '../../include/config.php';
 require_once '../../include/functions.php';
 require_once '../../include/functions_db.php';
 require_once '../../include/functions_events.php';
+require_once '../../include/functions_ui.php';
 require_once '../../include/auth/mysql.php';
 require_once $config['homedir'].'/include/class/HTML.class.php';
 
@@ -127,7 +128,7 @@ $output = '<div id="tabs-sound-modal">';
         // Content tabs.
         $output .= '<div id="tabs-sound-modal-1">';
         $output .= '<h3 class="title-discovered-alerts">';
-        $output .= __('Console configuration');
+        $output .= __('Console configuration').ui_print_help_tip(__('Warning: Minimizing this window will cause the Acoustic Console to not work as expected'), true);
         $output .= '</h3>';
         $inputs = [];
 
@@ -334,6 +335,7 @@ $output = '<div id="tabs-sound-modal">';
         );
         $output .= '</div>';
         $output .= '</div>';
+        $output .= html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true]);
         echo $output;
         ?>
 
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 6b98ffb55b..3794a30ae3 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -205,6 +205,10 @@ if ($access_console_node === true) {
             $sub['operation/inventory/inventory']['refr'] = 0;
         }
 
+        $sub['operation/custom_fields/custom_fields_view']['text'] = __('Custom fields view');
+        $sub['operation/custom_fields/custom_fields_view']['id'] = 'Custom fields view';
+        $sub['operation/custom_fields/custom_fields_view']['refr'] = 0;
+
         if ($config['activate_netflow'] || $config['activate_sflow']) {
             $sub['network_traffic'] = [
                 'text'    => __('Network'),
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index bf360c321e..cc85b26a7c 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -1,9 +1,12 @@
 #
 # Pandora FMS Console
 #
+%global _missing_build_ids_terminate_build 0
+%define __strip /bin/true
+%define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index c78f5b2532..14cc3baf6b 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -1,9 +1,12 @@
 #
 # Pandora FMS Console
 #
+%global _missing_build_ids_terminate_build 0
+%define __strip /bin/true
+%define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 8389808c10..0c5906ab20 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 22db03654e..b6c361a393 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -246,7 +246,8 @@ INSERT INTO `tmodule_group` VALUES
 (6,'Performance'),
 (7,'Database'),
 (8,'Enviromental'),
-(9,'Users');
+(9,'Users'),
+(10,'Security');
 
 UNLOCK TABLES;
 
@@ -2727,6 +2728,22 @@ INSERT IGNORE INTO `tdiscovery_apps_scripts` (`id_app`, `macro`, `value`) VALUES
 -- Insert into tdiscovery_apps_executions
 INSERT IGNORE INTO `tdiscovery_apps_executions` (`id`, `id_app`, `execution`) VALUES (1, @id_app, '&#039;_exec1_&#039;&#x20;-g&#x20;&#039;__taskGroup__&#039;&#x20;--host&#x20;&#039;_host_&#039;&#x20;--port&#x20;&#039;_port_&#039;&#x20;--user&#x20;&#039;_user_&#039;&#x20;--password&#x20;&#039;_password_&#039;&#x20;--vm&#x20;&#039;_scanVM_&#039;&#x20;--lxc&#x20;&#039;_scanLXC_&#039;&#x20;--backups&#x20;&#039;_scanBackups_&#039;&#x20;--nodes&#x20;&#039;_scanNodes_&#039;&#x20;--transfer_mode&#x20;tentacle&#x20;--tentacle_address&#x20;&#039;_tentacleIP_&#039;&#x20;--tentacle_port&#x20;&#039;_tentaclePort_&#039;&#x20;--as_discovery_plugin&#x20;1');
 
+-- Insert new SAP APP
+SET @short_name = 'pandorafms.sap.deset';
+SET @name = 'SAP&#x20;R3&#x20;-&#x20;Deset';
+SET @section = 'app';
+SET @description = 'Monitor&#x20;SAP&#x20;R3&#x20;environments';
+SET @version = '1.0';
+INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
+SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;
+
+-- Insert into tdiscovery_apps_scripts
+INSERT IGNORE INTO `tdiscovery_apps_scripts` (`id_app`, `macro`, `value`) VALUES (@id_app, '_exec1_', 'bin/pandora_sap_deset');
+INSERT IGNORE INTO `tdiscovery_apps_scripts` (`id_app`, `macro`, `value`) VALUES (@id_app, '_java_', 'bin/lib/jre/bin/java');
+
+-- Insert into tdiscovery_apps_executions
+INSERT IGNORE INTO `tdiscovery_apps_executions` (`id`, `id_app`, `execution`) VALUES (1, @id_app, '&#039;_exec1_&#039;&#x20;--conf&#x20;&#039;_tempfileConf_&#039;&#x20;--custom_modules&#x20;&#039;_tempfileCustomModules_&#039;');
+
 -- Insert new EC2 APP
 SET @short_name = 'pandorafms.aws.ec2';
 SET @name = 'Amazon&#x20;EC2';
diff --git a/pandora_plugins/message_app_connectors/discord/.gitignore b/pandora_plugins/message_app_connectors/discord/.gitignore
index 5ceb3864c2..9c10928fd9 100644
--- a/pandora_plugins/message_app_connectors/discord/.gitignore
+++ b/pandora_plugins/message_app_connectors/discord/.gitignore
@@ -1 +1,3 @@
-venv
+build
+dist
+*spec
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py b/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py
index 715657da28..1efa696d19 100644
--- a/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py
+++ b/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py
@@ -1,4 +1,4 @@
-import requests, argparse, sys, os
+import requests, argparse, sys, os, signal
 from datetime import datetime
 from re import search
 from base64 import b64decode
@@ -26,6 +26,18 @@ parser.add_argument('--tmp_dir', help='Temporary path to store graph images', de
 
 args = parser.parse_args()
 
+# Define a function to handle the SIGINT signal
+def sigint_handler(signal, frame):
+    print ('\nInterrupted by user')
+    sys.exit(0)
+signal.signal(signal.SIGINT, sigint_handler)
+
+# Define a function to handle the SIGTERM signal
+def sigterm_handler(signum, frame):
+    print("Received SIGTERM signal.")
+    sys.exit(0)
+signal.signal(signal.SIGTERM, sigterm_handler)
+
 ### Functions:
 def parse_dic(cValues):
     """convert coma separate keypairs into a dic. EX "test=5,house=8,market=2" wil return "{'test': '5', 'casa': '8', 'mercado': '2'}" """
diff --git a/pandora_plugins/message_app_connectors/gchat/.gitignore b/pandora_plugins/message_app_connectors/gchat/.gitignore
new file mode 100644
index 0000000000..9c10928fd9
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/gchat/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+*spec
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py b/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py
index 4584768ec7..b062cc34ed 100644
--- a/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py
+++ b/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py
@@ -1,8 +1,4 @@
-import requests
-import argparse
-import sys
-import os
-import json
+import requests, signal, argparse, sys, os, json
 
 ### Variables and arg parser ###
 parser = argparse.ArgumentParser(description='Google chat webhook conector')
@@ -23,6 +19,18 @@ parser.add_argument('--btn_url', help='button url',
 
 args = parser.parse_args()
 
+# Define a function to handle the SIGINT signal
+def sigint_handler(signal, frame):
+    print ('\nInterrupted by user')
+    sys.exit(0)
+signal.signal(signal.SIGINT, sigint_handler)
+
+# Define a function to handle the SIGTERM signal
+def sigterm_handler(signum, frame):
+    print("Received SIGTERM signal.")
+    sys.exit(0)
+signal.signal(signal.SIGTERM, sigterm_handler)
+
 # classes
 
 
diff --git a/pandora_plugins/message_app_connectors/ilert/.gitignore b/pandora_plugins/message_app_connectors/ilert/.gitignore
new file mode 100644
index 0000000000..9c10928fd9
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/ilert/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+*spec
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/ilert/pandora_ilert.py b/pandora_plugins/message_app_connectors/ilert/pandora_ilert.py
new file mode 100644
index 0000000000..33f9654a6e
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/ilert/pandora_ilert.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__author__ = "PandoraFMS Team"
+__copyright__ = "Copyright 2023, PandoraFMS"
+#__credits__ = ["Rob Knight", "Peter Maxwell", "Gavin Huttley", "Matthew Wakefield"]
+__maintainer__ = "Projects/QA department"
+__status__ = "Test"
+__version__ = "1"
+
+import requests, json, sys, argparse, signal, re,datetime
+
+current_date=datetime.datetime.now()
+info= f"""
+PandoraFMS ilert integration. 
+Version: {__version__}
+"""
+
+parser = argparse.ArgumentParser(description= info, formatter_class=argparse.RawTextHelpFormatter)
+parser.add_argument('-a', '--api_key', help='Api key from ilert', required=True)
+parser.add_argument('-t', '--event_type', help='Type of the created event. Can be "alert" or "resolved".', type=str, required=True)
+parser.add_argument('-k', '--event_key', help='Title of the event, used as key', type=str, required=True)
+parser.add_argument('-T', '--title', help='Title of the event.', type=str, required=True)
+parser.add_argument('-d', '--description', help='Description of the event', type=str, default='')
+parser.add_argument('-A', '--agent_name', help='pandorafms agent name', type=str, default='')
+parser.add_argument('-p', '--priority', help='priority', type=str, default='')
+parser.add_argument('-m', '--module_name', help='priority', type=str, default='')
+parser.add_argument('-D', '--module_data', help='priority', type=str, default='')
+parser.add_argument('-C', '--created_date', help='event date', type=str, default=current_date)
+
+args = parser.parse_args()
+
+# Define a function to handle the SIGINT signal
+def sigint_handler(signal, frame):
+    print ('\nInterrupted by user')
+    sys.exit(0)
+signal.signal(signal.SIGINT, sigint_handler)
+
+# Define a function to handle the SIGTERM signal
+def sigterm_handler(signum, frame):
+    print("Received SIGTERM signal.")
+    sys.exit(0)
+signal.signal(signal.SIGTERM, sigterm_handler)
+
+# Functions
+
+def post_url(url, data=None, headers={"Accept": "application/json"},):
+    try :
+        data = requests.post(url, data=data, headers=headers)
+        result_data = data.status_code
+    except Exception as e :
+        print (f"[red]Error[/red] posting data from {url} {e}", file = sys.stderr )
+        sys.exit()
+    return result_data
+
+if __name__ == "__main__":
+    # Prepare data
+    url = f"https://api.ilert.com/api/v1/events/pandorafms/{args.api_key}"
+    
+    payload = {
+        "eventType": args.event_type,
+        "title": args.title,
+        "description": args.description,
+        "incidentKey": args.event_key,
+        "details": {
+            "agentName": args.agent_name,
+            "createdAt": str(args.created_date),
+            "priority": args.priority,
+            "moduleName": args.module_name,
+            "moduleData": args.module_data
+        }
+    }
+
+    response=post_url(url, data=json.dumps(payload))
+
+    if response == 202: print ("Alert has been submitted!")
+    print (f"http_code: {response}", file=sys.stderr)
+
diff --git a/pandora_plugins/message_app_connectors/ilert/requirements.txt b/pandora_plugins/message_app_connectors/ilert/requirements.txt
new file mode 100644
index 0000000000..b8d86d56d7
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/ilert/requirements.txt
@@ -0,0 +1,8 @@
+altgraph==0.17.3
+certifi==2023.7.22
+charset-normalizer==3.3.0
+idna==3.4
+pyinstaller==5.13.0
+pyinstaller-hooks-contrib==2023.7
+requests==2.31.0
+urllib3==2.0.5
diff --git a/pandora_plugins/message_app_connectors/ms-teams/.gitignore b/pandora_plugins/message_app_connectors/ms-teams/.gitignore
new file mode 100644
index 0000000000..9c10928fd9
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/ms-teams/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+*spec
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/ms-teams/pandora-msteams-cli.py b/pandora_plugins/message_app_connectors/ms-teams/pandora-msteams-cli.py
index f0d4ac89a8..e387b447dd 100755
--- a/pandora_plugins/message_app_connectors/ms-teams/pandora-msteams-cli.py
+++ b/pandora_plugins/message_app_connectors/ms-teams/pandora-msteams-cli.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import argparse, pymsteams
+import argparse, pymsteams, signal
 
 parser = argparse.ArgumentParser(description='MS Teams connector')
 parser.add_argument('-d', '--data', help='Data in coma separate keypairs. Ex: test=5,house=2', required=True)
@@ -16,6 +16,18 @@ parser.add_argument('--button_desc', help='Pandora button description', default=
 
 args = parser.parse_args()
 
+# Define a function to handle the SIGINT signal
+def sigint_handler(signal, frame):
+    print ('\nInterrupted by user')
+    sys.exit(0)
+signal.signal(signal.SIGINT, sigint_handler)
+
+# Define a function to handle the SIGTERM signal
+def sigterm_handler(signum, frame):
+    print("Received SIGTERM signal.")
+    sys.exit(0)
+signal.signal(signal.SIGTERM, sigterm_handler)
+
 ### Functions:
 def parse_dic(cValues):
     """convert coma separate keypairs into a dic. EX "test=5,house=8,market=2" wil return "{'test': '5', 'casa': '8', 'mercado': '2'}" """
diff --git a/pandora_plugins/message_app_connectors/ms-teams/pandora-teams-cli.py b/pandora_plugins/message_app_connectors/ms-teams/pandora-teams-cli.py
deleted file mode 100755
index 4bd997b38f..0000000000
--- a/pandora_plugins/message_app_connectors/ms-teams/pandora-teams-cli.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-import argparse, pymsteams
-
-parser = argparse.ArgumentParser(description='MsTeams connector')
-parser.add_argument('-d', '--data', help='Data in coma separate keypairs. Ex: test=5,house=2', required=True)
-parser.add_argument('-u', '--url', help='Teams webhook URL', required=True)
-parser.add_argument('-t', '--alert_tittle', help='Alert tittle', default='PandoraFMS alert fired')
-parser.add_argument('-D', '--alert_desc', help='Alert description', default='Alert Fired')
-parser.add_argument('-m', '--message', help='Alert message', default='')
-parser.add_argument('-T','--tittle_color', help='Alert tittle descripcion in HEX EX: 53e514', default="53e514")
-parser.add_argument('--sub_desc', help='Alert sub description', default='Alert Fired')
-parser.add_argument('--thumb', help='Custom thumbnail url', default="https://pandorafms.com/images/alerta_roja.png")
-parser.add_argument('--button', help='Pandora button Url', default='https://pandorafms.com')
-parser.add_argument('--button_desc', help='Pandora button description', default='Open web console')
-
-args = parser.parse_args()
-
-### Functions:
-def parse_dic(cValues):
-    """convert coma separate keypairs into a dic. EX "test=5,house=8,market=2" wil return "{'test': '5', 'casa': '8', 'mercado': '2'}" """
-    data={}
-    try :
-        for kv in cValues.split(","):
-            k,v = kv.strip().split("=")
-            data[k.strip()]=v.strip()
-    except Exception as e :
-        print(f"Warning, error parsing keypairs values: {e}")
-    return data
-
-def add_embed_itmes(data):
-    """iterate dictionary and set webhook fields, one for eacj keypair"""
-    for k, v in data.items() :
-        myMessageSection.addFact(f"{k}:", v)
-
-##Main
-
-# You must create the connectorcard object with the Microsoft Webhook URL
-myTeamsMessage = pymsteams.connectorcard(args.url)
-
-# Set Summary
-myTeamsMessage.summary(args.message)
-
-# Set Alert tittle
-myTeamsMessage.title(args.alert_tittle)
-
-# Set link buttom
-myTeamsMessage.addLinkButton(args.button_desc, args.button)
-
-# Set message color
-myTeamsMessage.color(args.tittle_color)
-
-# create the section
-myMessageSection = pymsteams.cardsection()
-
-# Section Title
-myMessageSection.title(args.message)
-
-# Activity Elements
-myMessageSection.activityTitle(args.alert_desc)
-myMessageSection.activitySubtitle(args.sub_desc)
-myMessageSection.activityImage(args.thumb)
-
-# Facts are key value pairs displayed in a list.
-data = parse_dic(args.data)
-add_embed_itmes(data)
-
-# Section Text
-# myMessageSection.text("This is my section text")
-
-# Section Images
-# myMessageSection.addImage("http://i.imgur.com/c4jt321l.png", ititle="This Is Fine")
-
-# Add your section to the connector card object before sending
-myTeamsMessage.addSection(myMessageSection)
-
-# Then send the card
-try: 
-    myTeamsMessage.send()
-except Exception as e :
-        print(f"Error sending to message: {e}")
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/slack/.gitignore b/pandora_plugins/message_app_connectors/slack/.gitignore
index 5ceb3864c2..9c10928fd9 100644
--- a/pandora_plugins/message_app_connectors/slack/.gitignore
+++ b/pandora_plugins/message_app_connectors/slack/.gitignore
@@ -1 +1,3 @@
-venv
+build
+dist
+*spec
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py b/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py
index 5eb24fc865..8247bc1a5b 100644
--- a/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py
+++ b/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import requests, argparse, sys, os
+import requests, argparse, sys, os, signal
 from slack_sdk import WebClient
 from slack_sdk.errors import SlackApiError
 from datetime import datetime
@@ -26,6 +26,18 @@ parser.add_argument('--tmp_dir', help='Temporary path to store graph images', de
 args = parser.parse_args()
 filename = None
 
+# Define a function to handle the SIGINT signal
+def sigint_handler(signal, frame):
+    print ('\nInterrupted by user')
+    sys.exit(0)
+signal.signal(signal.SIGINT, sigint_handler)
+
+# Define a function to handle the SIGTERM signal
+def sigterm_handler(signum, frame):
+    print("Received SIGTERM signal.")
+    sys.exit(0)
+signal.signal(signal.SIGTERM, sigterm_handler)
+
 #Functions
 
 def parse_dic(cValues):
@@ -126,7 +138,7 @@ def send_message(message, channel, client, feddback=None):
         assert e.response["ok"] is False
         assert e.response["error"]  # str like 'invalid_auth', 'channel_not_found'
         print(f"Got an Slack auth error: {e.response['error']}")
-        exit()
+        sys.exit()
 
 def send_image(imagepath, channel, client) : 
     """Send file as slack bot"""
@@ -177,4 +189,4 @@ if args.footer: send_message(args.footer, args.channel, client)
 try:
     os.remove(filename)
 except:
-    exit()
\ No newline at end of file
+    sys.exit()
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/telegram-bot-cli/.gitignore b/pandora_plugins/message_app_connectors/telegram-bot-cli/.gitignore
new file mode 100644
index 0000000000..9c10928fd9
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/telegram-bot-cli/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+*spec
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/telegram-bot-cli/pandora-telegram-cli.py b/pandora_plugins/message_app_connectors/telegram-bot-cli/pandora-telegram-cli.py
index 8ee7520355..e7da24df83 100644
--- a/pandora_plugins/message_app_connectors/telegram-bot-cli/pandora-telegram-cli.py
+++ b/pandora_plugins/message_app_connectors/telegram-bot-cli/pandora-telegram-cli.py
@@ -1,4 +1,4 @@
-import requests, argparse, json, sys, os
+import requests, argparse, json, sys, os, signal
 from datetime import datetime
 from base64 import b64decode
 
@@ -27,7 +27,19 @@ def parse_dic(cValues):
         print(f"Warning, error parsing keypairs values: {e}")
     return data
 
+# Define a function to handle the SIGINT signal
+def sigint_handler(signal, frame):
+    print ('\nInterrupted by user')
+    sys.exit(0)
+signal.signal(signal.SIGINT, sigint_handler)
 
+# Define a function to handle the SIGTERM signal
+def sigterm_handler(signum, frame):
+    print("Received SIGTERM signal.")
+    sys.exit(0)
+signal.signal(signal.SIGTERM, sigterm_handler)
+
+#Functions
 def parse_api_conf(cConf):
     """Check apiconfiguration parameters """
     if args.api_conf :
diff --git a/pandora_plugins/message_app_connectors/vonage/.gitignore b/pandora_plugins/message_app_connectors/vonage/.gitignore
new file mode 100644
index 0000000000..9c10928fd9
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/vonage/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+*spec
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/vonage/pandora_vonage.py b/pandora_plugins/message_app_connectors/vonage/pandora_vonage.py
new file mode 100644
index 0000000000..a233367042
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/vonage/pandora_vonage.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__author__ = "PandoraFMS Team"
+__copyright__ = "Copyright 2023, PandoraFMS"
+#__credits__ = ["Rob Knight", "Peter Maxwell", "Gavin Huttley", "Matthew Wakefield"]
+__maintainer__ = "Projects/QA department"
+__status__ = "Test"
+__version__ = "1"
+
+import vonage, json, sys, argparse, signal, re,datetime
+
+current_date=datetime.datetime.now()
+info= f"""
+PandoraFMS vonage integration. 
+Version: {__version__}
+"""
+
+parser = argparse.ArgumentParser(description= info, formatter_class=argparse.RawTextHelpFormatter)
+parser.add_argument('-a', '--api_key', help='Client key from vonage', required=True)
+parser.add_argument('-s', '--secret', help='Secret key from vonage".', type=str, required=True)
+parser.add_argument('-m', '--message', help='Title of the event, used as key', type=str, required=True)
+parser.add_argument('-n', '--phone_number', help='Phone number to send sms with country code. Ex: "+34555444111,+34777444222" could be a coma separated list of numbers', type=str, required=True)
+parser.add_argument('-f', '--from_alias', help='From number/string data', type=str, default="PandoraFMS")
+parser.add_argument('-v', '--verbose', help='Debug information', action='store_true')
+
+
+args = parser.parse_args()
+
+# Define a function to handle the SIGINT signal
+def sigint_handler(signal, frame):
+    print ('\nInterrupted by user')
+    sys.exit(0)
+signal.signal(signal.SIGINT, sigint_handler)
+
+# Define a function to handle the SIGTERM signal
+def sigterm_handler(signum, frame):
+    print("Received SIGTERM signal.")
+    sys.exit(0)
+signal.signal(signal.SIGTERM, sigterm_handler)
+
+# Functions 
+
+def convet_list_comma (data:str):
+    if "," in data:
+        result = data.split(",")
+    else:
+        result = []
+        result.append(data)
+    return result
+
+
+if __name__ == "__main__":
+    # Prepare data
+    client = vonage.Client(key=args.api_key, secret=args.secret)
+
+    try:
+        numbers=convet_list_comma(args.phone_number)
+    except Exception as e:
+        print (f"Error: {e}")
+        sys.exit()
+
+    for number in numbers :
+        responseData = client.sms.send_message(
+            {
+                "from": args.from_alias,
+                "to": number,
+                "text": args.message,
+            }
+        )
+
+        if responseData["messages"][0]["status"] == "0":
+            print("Message sent successfully.")
+        else:
+            print(f"Message failed with error: {responseData['messages'][0]['error-text']}")
+
+        #debug
+        if args.verbose == True: print (f"Debug: {responseData}")
\ No newline at end of file
diff --git a/pandora_plugins/message_app_connectors/vonage/requirements.txt b/pandora_plugins/message_app_connectors/vonage/requirements.txt
new file mode 100644
index 0000000000..674ae0e1b7
--- /dev/null
+++ b/pandora_plugins/message_app_connectors/vonage/requirements.txt
@@ -0,0 +1,16 @@
+certifi==2023.7.22
+cffi==1.16.0
+charset-normalizer==3.3.0
+cryptography==41.0.4
+Deprecated==1.2.14
+idna==3.4
+pycparser==2.21
+pydantic==1.10.13
+PyJWT==2.8.0
+pytz==2023.3.post1
+requests==2.31.0
+typing_extensions==4.8.0
+urllib3==2.0.6
+vonage==3.9.1
+vonage-jwt==1.0.0
+wrapt==1.15.0
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 3b708ba708..cb23277387 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.773.3-231011
+Version: 7.0NG.773.3-231019
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 62955a603f..d3ae735539 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.773.3-231011"
+pandora_version="7.0NG.773.3-231019"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index 7aba09011f..2dfa5825b1 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -153,6 +153,9 @@ dataserver_smart_queue 1
 
 discoveryserver 1
 
+# discovery_threads. Each thread will scan a different scantask.
+discovery_threads 1
+
 # Discovery SAP (PANDORA FMS ENTERPRISE ONLY)
 # java /usr/bin/java
 
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 983c907cb0..679c4033a6 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "231011";
+my $pandora_build = "231019";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index b8f42b1734..58815a4ff9 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -7689,6 +7689,9 @@ sub safe_mode($$$$$$) {
 	elsif ($known_status == MODULE_CRITICAL) {
 		logger($pa_config, "Disabling safe mode for agent " . $agent->{'nombre'}, 10);
 		db_do($dbh, 'UPDATE tagente_modulo SET disabled=0 WHERE id_agente=? AND id_agente_modulo!=?', $agent->{'id_agente'}, $module->{'id_agente_modulo'});
+
+		# Prevent the modules from becoming unknown!
+		db_do ($dbh, 'UPDATE tagente_estado SET utimestamp = ? WHERE id_agente = ? AND id_agente_modulo!=?', time(), $agent->{'id_agente'}, $module->{'id_agente_modulo'});
 	}
 }
 
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index 22ee1611fa..c0ee332f64 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -814,14 +814,21 @@ sub get_plugin_id ($$) {
 ##########################################################################
 ## Return module group ID given the module group name.
 ##########################################################################
-sub get_module_group_id ($$) {
-	my ($dbh, $module_group_name) = @_;
+sub get_module_group_id ($$;$) {
+	my ($dbh, $module_group_name, $case_insensitve) = @_;
 	
+	$case_insensitve = 0 unless defined($case_insensitve);
+
 	if (!defined($module_group_name) || $module_group_name eq '') {
 		return 0;
 	}
 	
-	my $rc = get_db_value ($dbh, "SELECT id_mg FROM tmodule_group WHERE name = ?", safe_input($module_group_name));
+	my $rc; 
+	if($case_insensitve == 0) {
+		$rc = get_db_value ($dbh, "SELECT id_mg FROM tmodule_group WHERE name = ?", safe_input($module_group_name));
+	} else {
+		$rc = get_db_value ($dbh, "SELECT id_mg FROM tmodule_group WHERE LOWER(name) = ?", lc(safe_input($module_group_name)));
+	}
 	return defined ($rc) ? $rc : -1;
 }
 
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index b3c32522c6..80e8bb4bd3 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -812,7 +812,7 @@ sub process_module_data ($$$$$$$$$$) {
 		
 		# The group name has to be translated to a group ID
 		if (defined $module_conf->{'module_group'}) {
-			my $id_group_module = get_module_group_id ($dbh, $module_conf->{'module_group'});
+			my $id_group_module = get_module_group_id ($dbh, $module_conf->{'module_group'}, 1);
 			if ( $id_group_module >= 0) {
 				$module_conf->{'id_module_group'} = $id_group_module;
 			}
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 09dd84336c..e6e8e211cc 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "231011";
+my $pandora_build = "231019";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index f47d0d9558..b0994b4bb5 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,9 +2,12 @@
 # Pandora FMS Server 
 #
 %global __os_install_post %{nil}
+%global _missing_build_ids_terminate_build 0
+%define __strip /bin/true
+%define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b683278589..5e78696339 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     231011
+%define release     231019
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c6a7657f13..c65efdfb3a 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773.3"
-PI_BUILD="231011"
+PI_BUILD="231019"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f9ed7d40c7..b6e8e77248 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 231011";
+my $version = "7.0NG.773.3 Build 231019";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 9fe363175c..29b39101b2 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 231011";
+my $version = "7.0NG.773.3 Build 231019";
 
 # save program name for logging
 my $progname = basename($0);