From 580f1e624a8c8036a5f28b9b8d5230e5c5fd2588 Mon Sep 17 00:00:00 2001
From: "felix.suarez" <felix.suarez@pandorafms.com>
Date: Mon, 23 Oct 2023 12:25:28 -0500
Subject: [PATCH 01/41] Rename pandora_sca to pandora_hardening

---
 pandora_agents/unix/Linux/pandora_agent.conf                    | 2 +-
 pandora_agents/win32/bin/pandora_agent.conf                     | 2 +-
 .../win32/bin/util/{pandora_sca.exe => pandora_hardening.exe}   | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pandora_agents/win32/bin/util/{pandora_sca.exe => pandora_hardening.exe} (100%)

diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 179f98dac8..f6c0d7ab23 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -313,6 +313,6 @@ module_plugin autodiscover --default
 
 #Hardening plugin for security compliance analysis. Enable to use it.
 #module_begin
-#module_plugin /usr/share/pandora_agent/plugins/pandora_sca -t 150
+#module_plugin /usr/share/pandora_agent/plugins/pandora_hardening -t 150
 #module_absoluteinterval 7d
 #module_end
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index cd64fa670b..b51c272015 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -526,7 +526,7 @@ module_plugin "%PROGRAMFILES%\Pandora_Agent\util\autodiscover.exe" --default
 
 # Hardening plugin for security compliance analysis.
 #module_begin
-#module_plugin "%PROGRAMFILES%\Pandora_Agent\util\pandora_sca.exe -t 150"
+#module_plugin "%PROGRAMFILES%\Pandora_Agent\util\pandora_hardening.exe -t 150"
 #module_absoluteinterval 7d
 #module_end
 
diff --git a/pandora_agents/win32/bin/util/pandora_sca.exe b/pandora_agents/win32/bin/util/pandora_hardening.exe
similarity index 100%
rename from pandora_agents/win32/bin/util/pandora_sca.exe
rename to pandora_agents/win32/bin/util/pandora_hardening.exe

From ed1ae83770a20a97dff789ee7f51bca018394af6 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Mon, 30 Oct 2023 15:15:53 +0100
Subject: [PATCH 02/41] #12344 Fixed log source

---
 .../extras/delete_files/delete_files.txt      |  2 +
 .../operation/agentes/log_sources_status.php  | 76 +++++++++++++------
 2 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt
index 8a9c50f605..234ec4e997 100644
--- a/pandora_console/extras/delete_files/delete_files.txt
+++ b/pandora_console/extras/delete_files/delete_files.txt
@@ -1718,3 +1718,5 @@ operation/incidents/list_integriaims_incidents.php
 include/functions_incidents.php
 include/functions_integriaims.php
 include/ajax/integria_incidents.ajax.php
+enterprise/operation/log/log_source.php
+enterprise/include/class/LogSource.class.php
diff --git a/pandora_console/operation/agentes/log_sources_status.php b/pandora_console/operation/agentes/log_sources_status.php
index 32d017c480..d66ae65118 100644
--- a/pandora_console/operation/agentes/log_sources_status.php
+++ b/pandora_console/operation/agentes/log_sources_status.php
@@ -16,6 +16,8 @@ global $config;
 // Login check.
 check_login();
 
+enterprise_include('include/functions_elasticsearch.php');
+
 ?>
 <script type="text/javascript">
 
@@ -62,30 +64,58 @@ $table->style['source'] = 'width: 80%;';
 
 $table->data = [];
 
+$data = [];
+$data['agent_id'] = [0 => $agent_id];
+$filter = elasticsearch_filter_build($data, 0);
+$filter['aggs'] = [
+    'results' => [
+        'composite' => [
+            'sources' => [
+                [
+                    'source_id' => [
+                        'terms' => [
+                            'script' => ['source' => "params['_source'].source_id"],
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ],
+];
+
+$logs = elasticsearch_curl(
+    $filter,
+    $config['elasticsearch_ip'],
+    $config['elasticsearch_port'],
+    0,
+    false,
+    false,
+    false,
+    'desc',
+    false,
+);
+$logs = json_decode($logs);
+
 $row = [];
-
-
-// Get most recent sources for active agent.
-$sql = "select source, MAX(utimestamp) AS last_contact from tagent_module_log where id_agent=$agent_id GROUP BY source";
-
-$logs = mysql_db_get_all_rows_sql($sql);
-
-foreach ($logs as $log) {
-    $row['source'] = $log['source'];
-    $row['review'] = '<a href="javascript:void(0)">'.html_print_image('images/zoom.png', true, ['title' => __('Review in log viewer'), 'alt' => '', 'onclick' => "send_form('".$log['source'].'-'.$agent_id."')"]).'</a>';
-    $row['last_contact'] = html_print_image(
-        'images/spinner.gif',
-        true,
-        [
-            'id'     => 'img-'.$log['source'],
-            'border' => '0',
-            'width'  => '20px',
-            'heigth' => '20px',
-            'onload' => "get_last_contact('".$log['source']."', '".$agent_id."')",
-        ]
-    );
-
-    $table->data[$log['source']] = $row;
+if (empty($logs->aggregations) === false) {
+    $buckets = $logs->aggregations->results->buckets;
+    foreach ($buckets as $key => $bucket) {
+        $source = $bucket->key->source_id;
+        $row['source'] = $source;
+        $row['review'] = '<a href="javascript:void(0)">'.html_print_image('images/zoom.png', true, ['title' => __('Review in log viewer'), 'alt' => '', 'onclick' => "send_form('".$source.'-'.$agent_id."')"]).'</a>';
+        $row['last_contact'] = html_print_image(
+            'images/spinner.gif',
+            true,
+            [
+                'id'     => 'img-'.$source,
+                'border' => '0',
+                'width'  => '20px',
+                'heigth' => '20px',
+                'onload' => "get_last_contact('".$source."', '".$agent_id."')",
+            ]
+        );
+        $table->data[$source] = $row;
+    }
 }
 
 ob_start();

From 34c66981be59a4f236e5b9be87338cd76ccb2e95 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 31 Oct 2023 09:16:42 +0100
Subject: [PATCH 03/41] #12357 fixed pagination datatable

---
 pandora_console/include/class/SnmpConsole.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index 86132d3956..6945d9b1fb 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -738,7 +738,7 @@ class SnmpConsole extends HTML
             $sql_count = sprintf($sql_count, $whereSubquery);
 
             $traps = db_get_all_rows_sql($sql, true);
-            $total = (int) db_get_value_sql($sql_count, false, true);
+            $total = (int) db_get_value_sql($sql_count, false, false);
 
             if (empty($traps) === false) {
                 $data = $traps;

From 29c29ef562ab050ccac149125f0895cf66578ecd Mon Sep 17 00:00:00 2001
From: Ramon Novoa <ramon.novoa@pandorafms.com>
Date: Tue, 31 Oct 2023 11:45:19 +0100
Subject: [PATCH 04/41] Reset absoluteinterval when parsing a new module.

Fixes pandora_enterprise#12368.
---
 pandora_agents/unix/pandora_agent | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 49599efa4d..b784ec0e6e 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -4089,7 +4089,7 @@ sub grep_logs {
         return @data;
     }
 
-    sub create_log($$){
+    sub create_log {
         my ($module_name, @data) = @_;
 
         # No data
@@ -4282,6 +4282,7 @@ sub init_module ($) {
 	$module->{'macros'} = {};
 	$module->{'alert_template'} = undef;
 	$module->{'filter'} = undef;
+	$module->{'absoluteinterval'} = undef;
 }
 
 ################################################################################

From 07a0a41ad901bba057578dca4f4a12a704a31405 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 1 Nov 2023 01:00:29 +0100
Subject: [PATCH 05/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh    | 2 +-
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec     | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +-
 pandora_agents/unix/pandora_agent.spec            | 2 +-
 pandora_agents/unix/pandora_agent_installer       | 2 +-
 pandora_agents/win32/installer/pandora.mpi        | 2 +-
 pandora_agents/win32/pandora.cc                   | 2 +-
 pandora_agents/win32/versioninfo.rc               | 2 +-
 pandora_console/DEBIAN/control                    | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_console/include/config_process.php        | 2 +-
 pandora_console/install.php                       | 2 +-
 pandora_console/pandora_console.redhat.spec       | 2 +-
 pandora_console/pandora_console.rhel7.spec        | 2 +-
 pandora_console/pandora_console.spec              | 2 +-
 pandora_server/DEBIAN/control                     | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm           | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm      | 2 +-
 pandora_server/pandora_server.redhat.spec         | 2 +-
 pandora_server/pandora_server.spec                | 2 +-
 pandora_server/pandora_server_installer           | 2 +-
 pandora_server/util/pandora_db.pl                 | 2 +-
 pandora_server/util/pandora_manage.pl             | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index a70887de92..13ee2970a3 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-231031
+Version: 7.0NG.773.3-231101
 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 93fe95d24c..054d2473ba 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-231031"
+pandora_version="7.0NG.773.3-231101"
 
 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 b784ec0e6e..b7874ec9a8 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.773.3';
-use constant AGENT_BUILD => '231031';
+use constant AGENT_BUILD => '231101';
 
 # 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 9c81eadedd..3a5ded6762 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     231031
+%define release     231101
 
 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 68966f1a94..502984fef8 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     231031
+%define release     231101
 
 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 3086bd4102..7edc103af3 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     231031
+%define release     231101
 
 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 888a2ab4fa..b271c1f9d5 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="231031"
+PI_BUILD="231101"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ae71b2bf45..f6908c2a79 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231031}
+{231101}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index b9ab0f5d2e..7f4b5c5a45 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 231031")
+#define PANDORA_VERSION ("7.0NG.773.3 Build 231101")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index b57a00dfbc..ccdcb96e62 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 231031))"
+      VALUE "ProductVersion", "(7.0NG.773.3(Build 231101))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index db922b6538..c51d6c91cf 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.773.3-231031
+Version: 7.0NG.773.3-231101
 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 ec26a38525..1a1a84ffc0 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-231031"
+pandora_version="7.0NG.773.3-231101"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8ffdc71c33..7ecd70f361 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 = 'PC231031';
+$build_version = 'PC231101';
 $pandora_version = 'v7.0NG.773.3';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index fb0b661943..df4f6544bf 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 = '231031';
+            $build = '231101';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index dd9815ecaf..9e16091fc8 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231031
+%define release     231101
 
 # 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 b9c720ff2b..9150e02fe8 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231031
+%define release     231101
 
 # 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 acf41b0ee9..e0df369dbb 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     231031
+%define release     231101
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index d13fdcb2e2..cf8234324d 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.773.3-231031
+Version: 7.0NG.773.3-231101
 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 e2784ad126..a064a5460f 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-231031"
+pandora_version="7.0NG.773.3-231101"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 42c0ef2b05..bf4bc02aeb 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 = "231031";
+my $pandora_build = "231101";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 836bc8209a..35742b4480 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 = "231031";
+my $pandora_build = "231101";
 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 0936210692..2099d4340e 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     231031
+%define release     231101
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 8e48063d08..c41a93469b 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     231031
+%define release     231101
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index b3d6c4d8bf..e2ddc8f979 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="231031"
+PI_BUILD="231101"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 383422d602..3b0726c336 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 231031";
+my $version = "7.0NG.773.3 Build 231101";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 6ad0c4b85b..6373b3b9cd 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 231031";
+my $version = "7.0NG.773.3 Build 231101";
 
 # save program name for logging
 my $progname = basename($0);

From 20ac3cca46cb3ce6912c895fc65c2381efa95807 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 2 Nov 2023 01:00:20 +0100
Subject: [PATCH 06/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh    | 2 +-
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec     | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +-
 pandora_agents/unix/pandora_agent.spec            | 2 +-
 pandora_agents/unix/pandora_agent_installer       | 2 +-
 pandora_agents/win32/installer/pandora.mpi        | 2 +-
 pandora_agents/win32/pandora.cc                   | 2 +-
 pandora_agents/win32/versioninfo.rc               | 2 +-
 pandora_console/DEBIAN/control                    | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_console/include/config_process.php        | 2 +-
 pandora_console/install.php                       | 2 +-
 pandora_console/pandora_console.redhat.spec       | 2 +-
 pandora_console/pandora_console.rhel7.spec        | 2 +-
 pandora_console/pandora_console.spec              | 2 +-
 pandora_server/DEBIAN/control                     | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm           | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm      | 2 +-
 pandora_server/pandora_server.redhat.spec         | 2 +-
 pandora_server/pandora_server.spec                | 2 +-
 pandora_server/pandora_server_installer           | 2 +-
 pandora_server/util/pandora_db.pl                 | 2 +-
 pandora_server/util/pandora_manage.pl             | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 13ee2970a3..4838ddc3c0 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-231101
+Version: 7.0NG.773.3-231102
 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 054d2473ba..fb8fa09b91 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-231101"
+pandora_version="7.0NG.773.3-231102"
 
 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 b7874ec9a8..c7409eaab2 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.773.3';
-use constant AGENT_BUILD => '231101';
+use constant AGENT_BUILD => '231102';
 
 # 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 3a5ded6762..2de5268df4 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     231101
+%define release     231102
 
 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 502984fef8..00522e5011 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     231101
+%define release     231102
 
 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 7edc103af3..8a2a45f02b 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     231101
+%define release     231102
 
 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 b271c1f9d5..1f8922db26 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="231101"
+PI_BUILD="231102"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f6908c2a79..51e5834049 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231101}
+{231102}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 7f4b5c5a45..6973e22412 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 231101")
+#define PANDORA_VERSION ("7.0NG.773.3 Build 231102")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index ccdcb96e62..773ecdbf96 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 231101))"
+      VALUE "ProductVersion", "(7.0NG.773.3(Build 231102))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c51d6c91cf..df8205e4f2 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.773.3-231101
+Version: 7.0NG.773.3-231102
 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 1a1a84ffc0..1c69ee1361 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-231101"
+pandora_version="7.0NG.773.3-231102"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 7ecd70f361..1890662bc0 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 = 'PC231101';
+$build_version = 'PC231102';
 $pandora_version = 'v7.0NG.773.3';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index df4f6544bf..8c0824c756 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 = '231101';
+            $build = '231102';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 9e16091fc8..1654150994 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231101
+%define release     231102
 
 # 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 9150e02fe8..2c1bf670fb 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     231101
+%define release     231102
 
 # 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 e0df369dbb..719e1c821e 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     231101
+%define release     231102
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index cf8234324d..c99965732b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.773.3-231101
+Version: 7.0NG.773.3-231102
 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 a064a5460f..90245982a8 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-231101"
+pandora_version="7.0NG.773.3-231102"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index bf4bc02aeb..078a8e70c0 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 = "231101";
+my $pandora_build = "231102";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 35742b4480..0b9ea66b7e 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 = "231101";
+my $pandora_build = "231102";
 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 2099d4340e..fba5838296 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     231101
+%define release     231102
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c41a93469b..5cb76d6e09 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     231101
+%define release     231102
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e2ddc8f979..3afab349a3 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="231101"
+PI_BUILD="231102"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 3b0726c336..6fe8f1bc5e 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 231101";
+my $version = "7.0NG.773.3 Build 231102";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 6373b3b9cd..ba9be53aa5 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 231101";
+my $version = "7.0NG.773.3 Build 231102";
 
 # save program name for logging
 my $progname = basename($0);

From 5265ecbe9c300960e0ed4ead08b842006a396db6 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 2 Nov 2023 11:54:37 +0100
Subject: [PATCH 07/41] Updated version and build strings.

---
 pandora_agents/pc/AIX/pandora_agent.conf                    | 2 +-
 pandora_agents/pc/FreeBSD/pandora_agent.conf                | 2 +-
 pandora_agents/pc/HP-UX/pandora_agent.conf                  | 2 +-
 pandora_agents/pc/Linux/pandora_agent.conf                  | 2 +-
 pandora_agents/pc/NT4/pandora_agent.conf                    | 2 +-
 pandora_agents/pc/SunOS/pandora_agent.conf                  | 2 +-
 pandora_agents/pc/Win32/pandora_agent.conf                  | 2 +-
 pandora_agents/shellscript/aix/pandora_agent.conf           | 2 +-
 pandora_agents/shellscript/bsd-ipso/pandora_agent.conf      | 2 +-
 pandora_agents/shellscript/hp-ux/pandora_agent.conf         | 2 +-
 pandora_agents/shellscript/linux/pandora_agent.conf         | 2 +-
 pandora_agents/shellscript/mac_osx/pandora_agent.conf       | 2 +-
 pandora_agents/shellscript/openWRT/pandora_agent.conf       | 2 +-
 pandora_agents/shellscript/solaris/pandora_agent.conf       | 2 +-
 pandora_agents/unix/AIX/pandora_agent.conf                  | 2 +-
 pandora_agents/unix/DEBIAN/control                          | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh              | 2 +-
 pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh          | 2 +-
 pandora_agents/unix/Darwin/dmg/extras/distribution.xml      | 4 ++--
 .../PandoraFMS agent uninstaller.app/Contents/Info.plist    | 6 +++---
 pandora_agents/unix/Darwin/pandora_agent.conf               | 2 +-
 pandora_agents/unix/FreeBSD/pandora_agent.conf              | 2 +-
 pandora_agents/unix/HP-UX/pandora_agent.conf                | 2 +-
 pandora_agents/unix/Linux/pandora_agent.conf                | 2 +-
 pandora_agents/unix/NT4/pandora_agent.conf                  | 2 +-
 pandora_agents/unix/NetBSD/pandora_agent.conf               | 2 +-
 pandora_agents/unix/SunOS/pandora_agent.conf                | 2 +-
 pandora_agents/unix/pandora_agent                           | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec               | 4 ++--
 pandora_agents/unix/pandora_agent.redhat_bin.spec           | 4 ++--
 pandora_agents/unix/pandora_agent.spec                      | 4 ++--
 pandora_agents/unix/pandora_agent_installer                 | 2 +-
 pandora_agents/win32/bin/pandora_agent.conf                 | 2 +-
 pandora_agents/win32/installer/pandora.mpi                  | 4 ++--
 pandora_agents/win32/pandora.cc                             | 2 +-
 pandora_agents/win32/versioninfo.rc                         | 2 +-
 pandora_console/DEBIAN/control                              | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh                  | 2 +-
 pandora_console/include/config_process.php                  | 2 +-
 pandora_console/install.php                                 | 2 +-
 pandora_console/pandora_console.redhat.spec                 | 4 ++--
 pandora_console/pandora_console.rhel7.spec                  | 4 ++--
 pandora_console/pandora_console.spec                        | 4 ++--
 pandora_console/pandora_console_install                     | 2 +-
 pandora_server/DEBIAN/control                               | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh                   | 2 +-
 pandora_server/conf/pandora_server.conf.new                 | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm                     | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm                | 2 +-
 pandora_server/pandora_server.redhat.spec                   | 4 ++--
 pandora_server/pandora_server.spec                          | 4 ++--
 pandora_server/pandora_server_installer                     | 2 +-
 pandora_server/util/pandora_db.pl                           | 2 +-
 pandora_server/util/pandora_manage.pl                       | 2 +-
 54 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index 5c5ec2d3b6..37fb9b0854 100644
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, AIX version
+# Version 7.0NG.774, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index ed33c06e4d..5a36cea140 100644
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, FreeBSD Version
+# Version 7.0NG.774, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index 784c729f73..52cd8e1774 100644
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, HP-UX Version
+# Version 7.0NG.774, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index 6284c748f9..4ad837f943 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, GNU/Linux
+# Version 7.0NG.774, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index 28ee6bd21f..efa9d79f34 100644
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, GNU/Linux
+# Version 7.0NG.774, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf
index 3d17139780..3a97e4a011 100644
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, Solaris Version
+# Version 7.0NG.774, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index edf5a7847a..621c1d24ac 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2023 Pandora FMS 
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
 # Foundation; either version 2 of the Licence or any later version
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index d2c1806dc0..74841e0515 100644
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.773.3, AIX version
+# Version 7.0NG.774, AIX version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index 69b39f6a25..7ba120ca70 100644
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index b27bfe9167..bcbd2dbb35 100644
--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.773.3, HPUX Version
+# Version 7.0NG.774, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index 23dff46fb5..98c137741e 100644
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # Licensed under GPL license v2,
 # (c) 2003-2023 Pandora FMS
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index 3250232611..b4b3c35ac8 100644
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # Licensed under GPL license v2,
 # (c) 2003-2023 Pandora FMS
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index 29fd1d64da..9ea0d9a2aa 100644
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index a4b43f1944..954c52853b 100644
--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.773.3, Solaris version
+# Version 7.0NG.774, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 29fb0051d5..c3bea470ac 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, AIX version
+# Version 7.0NG.774, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 4838ddc3c0..6f224e55f2 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-231102
+Version: 7.0NG.774
 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 fb8fa09b91..139b26abf7 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-231102"
+pandora_version="7.0NG.774"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
index 91907dbd82..b1d0fea6db 100644
--- a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
+++ b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
@@ -31,7 +31,7 @@ fi
 if [ "$#" -ge 2 ]; then
 	VERSION="$2"
 else
-	VERSION="7.0NG.773.3"
+	VERSION="7.0NG.774"
 fi
 
 # Path for the generated DMG file
diff --git a/pandora_agents/unix/Darwin/dmg/extras/distribution.xml b/pandora_agents/unix/Darwin/dmg/extras/distribution.xml
index 94266e09e4..708d31a47a 100644
--- a/pandora_agents/unix/Darwin/dmg/extras/distribution.xml
+++ b/pandora_agents/unix/Darwin/dmg/extras/distribution.xml
@@ -19,11 +19,11 @@
     <choice id="com.pandorafms.pandorafms_src" visible="false">
         <pkg-ref id="com.pandorafms.pandorafms_src"/>
     </choice>
-    <pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.773.3" onConclusion="none">pandorafms_src.pdk</pkg-ref>
+    <pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.774" onConclusion="none">pandorafms_src.pdk</pkg-ref>
     <choice id="com.pandorafms.pandorafms_uninstall" visible="true" customLocation="/Applications">
         <pkg-ref id="com.pandorafms.pandorafms_uninstall"/>
     </choice>
-    <pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.773.3" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
+    <pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.774" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
 <!-- <installation-check script="check()" />
 	<script>
 	<![CDATA[
diff --git a/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist b/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist
index fc3bc63e55..6a529b7345 100644
--- a/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist	
+++ b/pandora_agents/unix/Darwin/dmg/files/pandorafms_uninstall/PandoraFMS agent uninstaller.app/Contents/Info.plist	
@@ -5,9 +5,9 @@
 	<key>CFBundleIconFile</key>                  <string>pandorafms.icns</string>
     <key>CFBundleIdentifier</key> <string>com.pandorafms.pandorafms_uninstall</string>
 
-    <key>CFBundleVersion</key>            <string>7.0NG.773.3</string>
-    <key>CFBundleGetInfoString</key>      <string>7.0NG.773.3 Pandora FMS on Aug 2020</string>
-    <key>CFBundleShortVersionString</key> <string>7.0NG.773.3</string>
+    <key>CFBundleVersion</key>            <string>7.0NG.774</string>
+    <key>CFBundleGetInfoString</key>      <string>7.0NG.774 Pandora FMS on Aug 2020</string>
+    <key>CFBundleShortVersionString</key> <string>7.0NG.774</string>
 	
     <key>NSPrincipalClass</key><string>NSApplication</string>
     <key>NSMainNibFile</key><string>MainMenu</string>
diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index 46a654561f..f75c439850 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, GNU/Linux
+# Version 7.0NG.774, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index 2ea5563f25..e38230a57a 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, FreeBSD Version
+# Version 7.0NG.774, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 87c2969ac9..a490a09f41 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, HP-UX Version
+# Version 7.0NG.774, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 2e1186ff6a..a3f06a5b05 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # Licensed under GPL license v2,
 # Copyright (c) 2004-2023 Pandora FMS
 # https://pandorafms.com
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index 5db29d3e12..d21bdb7427 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, GNU/Linux
+# Version 7.0NG.774, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index 0915c2b0e0..b0a074e9bd 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, NetBSD Version
+# Version 7.0NG.774, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index 5523e40c77..a8e73f17ba 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.773.3, Solaris Version
+# Version 7.0NG.774, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index c7409eaab2..3b7746983c 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1038,7 +1038,7 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.773.3';
+use constant AGENT_VERSION => '7.0NG.774';
 use constant AGENT_BUILD => '231102';
 
 # Agent log default file size maximum and instances
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 2de5268df4..b2e3f82bcb 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 
 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 00522e5011..8dd6ab0f56 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -4,8 +4,8 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 
 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 8a2a45f02b..9da1c913a2 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 
 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 1f8922db26..4cf5763ad2 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -9,7 +9,7 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.773.3"
+PI_VERSION="7.0NG.774"
 PI_BUILD="231102"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 2cbf7c4749..4fe5708591 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2023 Pandora FMS 
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
 # Foundation; either version 2 of the Licence or any later version
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 51e5834049..40ce2a5814 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.773.3}
+{Pandora FMS Windows Agent v7.0NG.774}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-<%Version%>-Setup<%Ext%>}
+{<%AppName%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 6973e22412..fde8c68b4c 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 231102")
+#define PANDORA_VERSION ("7.0NG.774 Build 231102")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 773ecdbf96..c45ae17608 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 231102))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231102))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index df8205e4f2..775fd89fdd 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.773.3-231102
+Version: 7.0NG.774
 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 1c69ee1361..ed12a58453 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-231102"
+pandora_version="7.0NG.774"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 1890662bc0..2678159ad0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -21,7 +21,7 @@
  * Pandora build version and version
  */
 $build_version = 'PC231102';
-$pandora_version = 'v7.0NG.773.3';
+$pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 8c0824c756..f22de5c0b0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -130,7 +130,7 @@
         </div>
         <div style='padding-bottom: 50px'>
             <?php
-            $version = '7.0NG.773.3';
+            $version = '7.0NG.774';
             $build = '231102';
             $banner = "v$version Build $build";
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 1654150994..25840e973e 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -5,8 +5,8 @@
 %define __strip /bin/true
 %define debug_package %{nil}
 %define name        pandorafms_console
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 
 # 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 2c1bf670fb..b488098893 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -5,8 +5,8 @@
 %define __strip /bin/true
 %define debug_package %{nil}
 %define name        pandorafms_console
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 
 # 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 719e1c821e..bc62607f46 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index ce07b04878..4e38473c66 100755
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.773.3"
+PI_VERSION="7.0NG.774"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index c99965732b..72e6643cbe 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.773.3-231102
+Version: 7.0NG.774
 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 90245982a8..33ccd33297 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-231102"
+pandora_version="7.0NG.774"
 
 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 8c1c294540..33ab26d411 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.773.3
+# Version 7.0NG.774
 # Licensed under GPL license v2,
 # (c) 2003-2023 Pandora FMS
 # http://www.pandorafms.com
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 078a8e70c0..5dbf59adc8 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.773.3";
+my $pandora_version = "7.0NG.774";
 my $pandora_build = "231102";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 0b9ea66b7e..ec915f407d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -33,7 +33,7 @@ use base 'Exporter';
 our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.773.3";
+my $pandora_version = "7.0NG.774";
 my $pandora_build = "231102";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index fba5838296..fd8545a6d1 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -6,8 +6,8 @@
 %define __strip /bin/true
 %define debug_package %{nil}
 %define name        pandorafms_server
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 5cb76d6e09..304a1a9271 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,8 +3,8 @@
 #
 %global __os_install_post %{nil}
 %define name        pandorafms_server
-%define version     7.0NG.773.3
-%define release     231102
+%define version     7.0NG.774
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3afab349a3..586ccb2b77 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,7 +8,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.773.3"
+PI_VERSION="7.0NG.774"
 PI_BUILD="231102"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 6fe8f1bc5e..434cde304a 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 231102";
+my $version = "7.0NG.774 Build 231102";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ba9be53aa5..9e54216ee3 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 231102";
+my $version = "7.0NG.774 Build 231102";
 
 # save program name for logging
 my $progname = basename($0);

From 4c368e5da5321dec90c1cf063f3790f81f02cb23 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Thu, 2 Nov 2023 12:33:30 +0100
Subject: [PATCH 08/41] #12344 Fixed filter 3

---
 .../operation/agentes/log_sources_status.php  | 40 ++-----------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/pandora_console/operation/agentes/log_sources_status.php b/pandora_console/operation/agentes/log_sources_status.php
index d66ae65118..26f0c4490a 100644
--- a/pandora_console/operation/agentes/log_sources_status.php
+++ b/pandora_console/operation/agentes/log_sources_status.php
@@ -64,45 +64,13 @@ $table->style['source'] = 'width: 80%;';
 
 $table->data = [];
 
-$data = [];
-$data['agent_id'] = [0 => $agent_id];
-$filter = elasticsearch_filter_build($data, 0);
-$filter['aggs'] = [
-    'results' => [
-        'composite' => [
-            'sources' => [
-                [
-                    'source_id' => [
-                        'terms' => [
-                            'script' => ['source' => "params['_source'].source_id"],
-                        ],
-                    ],
-                ],
-            ],
-        ],
-    ],
-];
-
-$logs = elasticsearch_curl(
-    $filter,
-    $config['elasticsearch_ip'],
-    $config['elasticsearch_port'],
-    0,
-    false,
-    false,
-    false,
-    'desc',
-    false,
-);
-$logs = json_decode($logs);
+$sources = get_sources_by_agent($agent_id);
 
 $row = [];
-if (empty($logs->aggregations) === false) {
-    $buckets = $logs->aggregations->results->buckets;
-    foreach ($buckets as $key => $bucket) {
-        $source = $bucket->key->source_id;
+if (empty($sources) === false) {
+    foreach ($sources as $key => $source) {
         $row['source'] = $source;
-        $row['review'] = '<a href="javascript:void(0)">'.html_print_image('images/zoom.png', true, ['title' => __('Review in log viewer'), 'alt' => '', 'onclick' => "send_form('".$source.'-'.$agent_id."')"]).'</a>';
+        $row['review'] = '<a href="javascript:void(0)">'.html_print_image('images/zoom.png', true, ['title' => __('Review in log viewer'), 'alt' => '', 'onclick' => "send_form('".$source."')"]).'</a>';
         $row['last_contact'] = html_print_image(
             'images/spinner.gif',
             true,

From 4060b27b72dd8f8675c02adeabb570a581b7e255 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <ramon.novoa@pandorafms.com>
Date: Thu, 2 Nov 2023 12:51:27 +0100
Subject: [PATCH 09/41] Make LWP use IO::Socket::SSL instead of Net::SSL.

---
 pandora_server/lib/PandoraFMS/Tools.pm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 70d697dab4..c4c118ae05 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -2735,12 +2735,6 @@ sub get_user_agent {
 			# Disable verify host certificate (only needed for self-signed cert)
 			$ua->ssl_opts( 'verify_hostname' => 0 );
 			$ua->ssl_opts( 'SSL_verify_mode' => 0x00 );
-
-			# Disable library extra checks 
-			BEGIN {
-				$ENV{PERL_NET_HTTPS_SSL_SOCKET_CLASS} = "Net::SSL";
-				$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
-			}
 		}
 	};
 	if($@) {

From 5d0088b1a784f8223bde27bb53df63119944b438 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 2 Nov 2023 15:27:26 +0100
Subject: [PATCH 10/41] fix certificate problem in test

---
 pandora_console/extensions/quick_shell.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index b03fe77f58..9ea79ba364 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -223,6 +223,8 @@ function quickShell()
     curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2);
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
     curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
     $response = curl_exec($ch);
     $responseCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
@@ -541,6 +543,9 @@ if (is_ajax() === true) {
         // Maximum time to establish a connection.
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1);
 
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+
         curl_exec($ch);
         $response_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         curl_close($ch);

From 287b983ce97d77a58845fb51c54c54e0921d1e2e Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Thu, 2 Nov 2023 15:39:55 +0100
Subject: [PATCH 11/41] #12371 Fixed events

---
 .../images/alert_recovered@svg.svg            |  9 ++++++
 pandora_console/include/ajax/events.php       | 10 +-----
 pandora_console/include/functions_events.php  |  6 +---
 pandora_console/include/styles/events.css     | 31 -------------------
 4 files changed, 11 insertions(+), 45 deletions(-)
 create mode 100644 pandora_console/images/alert_recovered@svg.svg

diff --git a/pandora_console/images/alert_recovered@svg.svg b/pandora_console/images/alert_recovered@svg.svg
new file mode 100644
index 0000000000..09f84d6215
--- /dev/null
+++ b/pandora_console/images/alert_recovered@svg.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / alert@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-alert" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10,20 C11.4190985,20 12.5702076,18.8808594 12.5702076,17.5 L7.42979244,17.5 C7.42979244,18.8808594 8.5809015,20 10,20 Z M18.6540098,14.1519531 C17.8777645,13.3410156 16.425318,12.1210937 16.425318,8.125 C16.425318,5.08984375 14.2364028,2.66015625 11.2849029,2.0640625 L11.2849029,1.25 C11.2849029,0.559765625 10.7095493,0 10,0 C9.29045075,0 8.71509711,0.559765625 8.71509711,1.25 L8.71509711,2.0640625 C5.76359722,2.66015625 3.57468198,5.08984375 3.57468198,8.125 C3.57468198,12.1210938 2.12223547,13.3410156 1.3459902,14.1519531 C1.10492023,14.4039062 0.998045886,14.7050781 1.00002702,15 C1.00447442,15.640625 1.52156948,16.25 2.28977909,16.25 L17.7102209,16.25 C18.4784305,16.25 18.9959274,15.640625 18.999973,15 C19.0019541,14.7050781 18.8950798,14.4035156 18.6540098,14.1519531 L18.6540098,14.1519531 Z" id="Shape" fill="#82b92e"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 593fa9a975..7e8341c4a1 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -2065,14 +2065,6 @@ if ($table_events) {
     // (propagate ACL funct!).
     $groups = users_get_groups($config['id_user']);
 
-    $tags_condition = tags_get_acl_tags(
-        $config['id_user'],
-        array_keys($groups),
-        'ER',
-        'event_condition',
-        'AND'
-    );
-
     $tableEvents24h = new stdClass();
     $tableEvents24h->class = 'filter_table';
     $tableEvents24h->styleTable = 'border: 0;padding: 0;margin: 0 0 10px;';
@@ -2107,7 +2099,7 @@ if ($table_events) {
         );
     } else {
         events_print_event_table(
-            'estado <> 1 '.$tags_condition,
+            'estado <> 1',
             200,
             '100%',
             false,
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index f709fe2b4c..5534897e84 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2593,7 +2593,7 @@ function events_print_type_img(
 
     switch ($type) {
         case 'alert_recovered':
-            $style .= ' alert_module_background_state icon_background_normal ';
+            $icon = 'images/alert_recovered@svg.svg';
         break;
 
         case 'alert_manual_validation':
@@ -2609,20 +2609,16 @@ function events_print_type_img(
         case 'going_up_normal':
         case 'going_down_normal':
             // This is to be backwards compatible.
-            // $style .= ' event_module_background_state icon_background_normal';
             $icon = 'images/module_ok.png';
         break;
 
         case 'going_up_warning':
             $icon = 'images/module_warning.png';
-            // $style .= ' event_module_background_state icon_background_warning';
         case 'going_down_warning':
             $icon = 'images/module_warning.png';
-            // $style .= ' event_module_background_state icon_background_warning';
         break;
 
         case 'going_unknown':
-            // $style .= ' event_module_background_state icon_background_unknown';
             $icon = 'images/module_unknown.png';
         break;
 
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index f552357e42..edf5014385 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -470,37 +470,6 @@ div.multi-response-buttons {
   margin-bottom: 5px;
 }
 
-/*
-.main_menu_icon_event {
-  height: 20px;
-}
-*/
-.event_module_background_state {
-  mask: url(../../images/modules@svg.svg) no-repeat center / contain;
-  -webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;
-}
-
-.alert_module_background_state {
-  mask: url(../../images/alert@svg.svg) no-repeat center / contain;
-  -webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain;
-}
-
-.icon_background_critical {
-  background-color: #e63c52;
-}
-
-.icon_background_warning {
-  background-color: #fcab10;
-}
-
-.icon_background_normal {
-  background-color: #82b92e;
-}
-
-.icon_background_unknown {
-  background-color: gray;
-}
-
 .events-refr {
   width: 300px;
   display: flex;

From d05ffaac568f465644edcc73af9e795c85ce5885 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 3 Nov 2023 01:00:22 +0100
Subject: [PATCH 12/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh    | 2 +-
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec     | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +-
 pandora_agents/unix/pandora_agent.spec            | 2 +-
 pandora_agents/unix/pandora_agent_installer       | 2 +-
 pandora_agents/win32/installer/pandora.mpi        | 4 ++--
 pandora_agents/win32/pandora.cc                   | 2 +-
 pandora_agents/win32/versioninfo.rc               | 2 +-
 pandora_console/DEBIAN/control                    | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_console/include/config_process.php        | 2 +-
 pandora_console/install.php                       | 2 +-
 pandora_console/pandora_console.redhat.spec       | 2 +-
 pandora_console/pandora_console.rhel7.spec        | 2 +-
 pandora_console/pandora_console.spec              | 2 +-
 pandora_server/DEBIAN/control                     | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm           | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm      | 2 +-
 pandora_server/pandora_server.redhat.spec         | 2 +-
 pandora_server/pandora_server.spec                | 2 +-
 pandora_server/pandora_server_installer           | 2 +-
 pandora_server/util/pandora_db.pl                 | 2 +-
 pandora_server/util/pandora_manage.pl             | 2 +-
 26 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 6f224e55f2..2d70b58a57 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774
+Version: 7.0NG.774-231103
 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 139b26abf7..fa16a33fe7 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774"
+pandora_version="7.0NG.774-231103"
 
 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 3b7746983c..71206de629 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231102';
+use constant AGENT_BUILD => '231103';
 
 # 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 b2e3f82bcb..57964891d8 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 
 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 8dd6ab0f56..d3bb77cae9 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 
 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 9da1c913a2..296edbf69e 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 
 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 4cf5763ad2..1e64137478 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231102"
+PI_BUILD="231103"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 40ce2a5814..ef2cb9a811 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231102}
+{231103}
 
 ViewReadme
 {Yes}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-Setup<%Ext%>}
+{<%AppName%>-<%Version%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index fde8c68b4c..cb2ed39b80 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231102")
+#define PANDORA_VERSION ("7.0NG.774 Build 231103")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c45ae17608..0238576843 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231102))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231103))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 775fd89fdd..4c5b687ee1 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774
+Version: 7.0NG.774-231103
 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 ed12a58453..0de39af139 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774"
+pandora_version="7.0NG.774-231103"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 2678159ad0..eb5ad11714 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 = 'PC231102';
+$build_version = 'PC231103';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f22de5c0b0..e788102cc6 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231102';
+            $build = '231103';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 25840e973e..8de0411417 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 
 # 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 b488098893..cb0a2601f6 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 
 # 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 bc62607f46..d12a980ca7 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 72e6643cbe..42dc4053db 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774
+Version: 7.0NG.774-231103
 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 33ccd33297..efcb44d1dc 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774"
+pandora_version="7.0NG.774-231103"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5dbf59adc8..54558d53a1 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231102";
+my $pandora_build = "231103";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index ec915f407d..92735b118b 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231102";
+my $pandora_build = "231103";
 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 fd8545a6d1..f7cd9b0685 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 304a1a9271..86281d05fd 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     1
+%define release     231103
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 586ccb2b77..9291b89a27 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231102"
+PI_BUILD="231103"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 434cde304a..2a421d35dd 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231102";
+my $version = "7.0NG.774 Build 231103";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 9e54216ee3..0c6cfcb292 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231102";
+my $version = "7.0NG.774 Build 231103";
 
 # save program name for logging
 my $progname = basename($0);

From 718cf41098133bd5fb22a5298ad153fb6f390239 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 3 Nov 2023 12:16:54 +0100
Subject: [PATCH 13/41] Fix btn csv datatables pandora_enterprise#12370

---
 pandora_console/include/styles/pandora.css |  6 ------
 pandora_console/include/styles/tables.css  |  2 --
 pandora_console/views/cluster/list.php     | 14 ++++++++------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 63179618b1..759acca415 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -12741,12 +12741,6 @@ div.agents_custom_fields #datatables_wrapper div.bottom {
   justify-content: flex-start !important;
 }
 
-.dt-buttons {
-  width: auto;
-  position: absolute;
-  margin-left: 90px;
-}
-
 .title_tactical {
   padding: 10px 0px 10px 0px;
   text-align: center;
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 0e4879220a..b0129d5968 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -369,8 +369,6 @@ a.pandora_pagination.current:hover {
   font-size: 20px;
   height: 38px;
   width: 80px;
-  margin-left: 90px;
-
   display: flex;
   justify-content: space-between;
   flex-direction: row;
diff --git a/pandora_console/views/cluster/list.php b/pandora_console/views/cluster/list.php
index 39c00efd91..78b6b25698 100644
--- a/pandora_console/views/cluster/list.php
+++ b/pandora_console/views/cluster/list.php
@@ -120,6 +120,7 @@ try {
     echo $e->getMessage();
 }
 
+$buttons = [];
 if (check_acl($config['id_user'], 0, 'AW')) {
     $buttons[] = html_print_submit_button(
         __('New cluster'),
@@ -131,10 +132,11 @@ if (check_acl($config['id_user'], 0, 'AW')) {
         ],
         true
     );
-    echo '<form action="'.ui_get_full_url($model->url.'&op=new').'" method="POST">';
-    html_print_action_buttons(
-        implode('', $buttons),
-        ['type' => 'form_action']
-    );
-    echo '</form>';
 }
+
+echo '<form action="'.ui_get_full_url($model->url.'&op=new').'" method="POST">';
+html_print_action_buttons(
+    implode('', $buttons),
+    ['type' => 'form_action']
+);
+echo '</form>';

From cc954ab4714d21eba650c9ea42378dbeb1bf2d08 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 4 Nov 2023 01:00:23 +0100
Subject: [PATCH 14/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh    | 2 +-
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec     | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +-
 pandora_agents/unix/pandora_agent.spec            | 2 +-
 pandora_agents/unix/pandora_agent_installer       | 2 +-
 pandora_agents/win32/installer/pandora.mpi        | 2 +-
 pandora_agents/win32/pandora.cc                   | 2 +-
 pandora_agents/win32/versioninfo.rc               | 2 +-
 pandora_console/DEBIAN/control                    | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_console/include/config_process.php        | 2 +-
 pandora_console/install.php                       | 2 +-
 pandora_console/pandora_console.redhat.spec       | 2 +-
 pandora_console/pandora_console.rhel7.spec        | 2 +-
 pandora_console/pandora_console.spec              | 2 +-
 pandora_server/DEBIAN/control                     | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm           | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm      | 2 +-
 pandora_server/pandora_server.redhat.spec         | 2 +-
 pandora_server/pandora_server.spec                | 2 +-
 pandora_server/pandora_server_installer           | 2 +-
 pandora_server/util/pandora_db.pl                 | 2 +-
 pandora_server/util/pandora_manage.pl             | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 2d70b58a57..fd0d564391 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231103
+Version: 7.0NG.774-231104
 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 fa16a33fe7..24cb30b3a5 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231103"
+pandora_version="7.0NG.774-231104"
 
 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 71206de629..85d1b4c379 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231103';
+use constant AGENT_BUILD => '231104';
 
 # 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 57964891d8..0b8271556d 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 
 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 d3bb77cae9..0d9703c2e0 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 
 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 296edbf69e..5ec3030cbf 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 
 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 1e64137478..fb3006c925 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231103"
+PI_BUILD="231104"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ef2cb9a811..16d0449424 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231103}
+{231104}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index cb2ed39b80..0bd5029e8b 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231103")
+#define PANDORA_VERSION ("7.0NG.774 Build 231104")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0238576843..5432257560 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231103))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231104))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4c5b687ee1..44e2b031d0 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231103
+Version: 7.0NG.774-231104
 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 0de39af139..1bd6e0b6fc 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231103"
+pandora_version="7.0NG.774-231104"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index eb5ad11714..ebe0a5cf24 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 = 'PC231103';
+$build_version = 'PC231104';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e788102cc6..238b49b7a9 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231103';
+            $build = '231104';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 8de0411417..b70cf5c4e6 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 
 # 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 cb0a2601f6..ae094761fa 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 
 # 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 d12a980ca7..cfca39cc5d 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 42dc4053db..be806518bc 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231103
+Version: 7.0NG.774-231104
 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 efcb44d1dc..c80d22b3ad 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231103"
+pandora_version="7.0NG.774-231104"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 54558d53a1..56f7a20c23 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231103";
+my $pandora_build = "231104";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 92735b118b..3774c946f0 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231103";
+my $pandora_build = "231104";
 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 f7cd9b0685..6475324317 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 86281d05fd..fef043c1d5 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231103
+%define release     231104
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 9291b89a27..431a30a899 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231103"
+PI_BUILD="231104"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2a421d35dd..bba027196d 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231103";
+my $version = "7.0NG.774 Build 231104";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0c6cfcb292..5aca3763e8 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231103";
+my $version = "7.0NG.774 Build 231104";
 
 # save program name for logging
 my $progname = basename($0);

From f0d0ad540f15dfd4410b543943967b73f5803d96 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 5 Nov 2023 01:00:18 +0100
Subject: [PATCH 15/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh    | 2 +-
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec     | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +-
 pandora_agents/unix/pandora_agent.spec            | 2 +-
 pandora_agents/unix/pandora_agent_installer       | 2 +-
 pandora_agents/win32/installer/pandora.mpi        | 2 +-
 pandora_agents/win32/pandora.cc                   | 2 +-
 pandora_agents/win32/versioninfo.rc               | 2 +-
 pandora_console/DEBIAN/control                    | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_console/include/config_process.php        | 2 +-
 pandora_console/install.php                       | 2 +-
 pandora_console/pandora_console.redhat.spec       | 2 +-
 pandora_console/pandora_console.rhel7.spec        | 2 +-
 pandora_console/pandora_console.spec              | 2 +-
 pandora_server/DEBIAN/control                     | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm           | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm      | 2 +-
 pandora_server/pandora_server.redhat.spec         | 2 +-
 pandora_server/pandora_server.spec                | 2 +-
 pandora_server/pandora_server_installer           | 2 +-
 pandora_server/util/pandora_db.pl                 | 2 +-
 pandora_server/util/pandora_manage.pl             | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index fd0d564391..6fc0902969 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231104
+Version: 7.0NG.774-231105
 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 24cb30b3a5..7bce2e95bb 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231104"
+pandora_version="7.0NG.774-231105"
 
 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 85d1b4c379..b2c1522d3a 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231104';
+use constant AGENT_BUILD => '231105';
 
 # 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 0b8271556d..9e640bae01 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 
 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 0d9703c2e0..8d631e02bb 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 
 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 5ec3030cbf..b65ac13bb9 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 
 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 fb3006c925..9c42866ff5 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231104"
+PI_BUILD="231105"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 16d0449424..aa4ad7bb35 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231104}
+{231105}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 0bd5029e8b..6d92a29e58 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231104")
+#define PANDORA_VERSION ("7.0NG.774 Build 231105")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5432257560..112c212929 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231104))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231105))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 44e2b031d0..037ec3a6d4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231104
+Version: 7.0NG.774-231105
 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 1bd6e0b6fc..4874ee7bab 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231104"
+pandora_version="7.0NG.774-231105"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ebe0a5cf24..9ef7b3fab7 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 = 'PC231104';
+$build_version = 'PC231105';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 238b49b7a9..d4bf51b042 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231104';
+            $build = '231105';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index b70cf5c4e6..64b382e85b 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 
 # 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 ae094761fa..4960f0cff3 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 
 # 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 cfca39cc5d..a6584920f3 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index be806518bc..f763f3f1d3 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231104
+Version: 7.0NG.774-231105
 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 c80d22b3ad..a20ff66110 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231104"
+pandora_version="7.0NG.774-231105"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 56f7a20c23..ecad72b23b 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231104";
+my $pandora_build = "231105";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 3774c946f0..2a91f6ef32 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231104";
+my $pandora_build = "231105";
 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 6475324317..bdabe04cc3 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index fef043c1d5..5dbf71bbf3 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231104
+%define release     231105
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 431a30a899..77b14febc7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231104"
+PI_BUILD="231105"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index bba027196d..0380aa6b08 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231104";
+my $version = "7.0NG.774 Build 231105";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5aca3763e8..4254f0772d 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231104";
+my $version = "7.0NG.774 Build 231105";
 
 # save program name for logging
 my $progname = basename($0);

From 96d8fe33f3a6ce52e0fcd9e6e35ae212e51225da Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 6 Nov 2023 01:00:19 +0100
Subject: [PATCH 16/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh    | 2 +-
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec     | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +-
 pandora_agents/unix/pandora_agent.spec            | 2 +-
 pandora_agents/unix/pandora_agent_installer       | 2 +-
 pandora_agents/win32/installer/pandora.mpi        | 2 +-
 pandora_agents/win32/pandora.cc                   | 2 +-
 pandora_agents/win32/versioninfo.rc               | 2 +-
 pandora_console/DEBIAN/control                    | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_console/include/config_process.php        | 2 +-
 pandora_console/install.php                       | 2 +-
 pandora_console/pandora_console.redhat.spec       | 2 +-
 pandora_console/pandora_console.rhel7.spec        | 2 +-
 pandora_console/pandora_console.spec              | 2 +-
 pandora_server/DEBIAN/control                     | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm           | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm      | 2 +-
 pandora_server/pandora_server.redhat.spec         | 2 +-
 pandora_server/pandora_server.spec                | 2 +-
 pandora_server/pandora_server_installer           | 2 +-
 pandora_server/util/pandora_db.pl                 | 2 +-
 pandora_server/util/pandora_manage.pl             | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 6fc0902969..630cb879a1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231105
+Version: 7.0NG.774-231106
 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 7bce2e95bb..e495fd6a40 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231105"
+pandora_version="7.0NG.774-231106"
 
 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 b2c1522d3a..3201ed337b 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231105';
+use constant AGENT_BUILD => '231106';
 
 # 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 9e640bae01..04766894d9 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 
 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 8d631e02bb..94572e700b 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 
 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 b65ac13bb9..22cb656200 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 
 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 9c42866ff5..d2c5675164 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231105"
+PI_BUILD="231106"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index aa4ad7bb35..83674ed0b2 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231105}
+{231106}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 6d92a29e58..96a79a12aa 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231105")
+#define PANDORA_VERSION ("7.0NG.774 Build 231106")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 112c212929..3ef09dd2e6 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231105))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231106))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 037ec3a6d4..1bbb3e3325 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231105
+Version: 7.0NG.774-231106
 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 4874ee7bab..02dd0e1613 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231105"
+pandora_version="7.0NG.774-231106"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9ef7b3fab7..3115fc8631 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 = 'PC231105';
+$build_version = 'PC231106';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d4bf51b042..580ebe3d45 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231105';
+            $build = '231106';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 64b382e85b..b308bdb11f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 
 # 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 4960f0cff3..b95e39d8aa 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 
 # 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 a6584920f3..b695683a80 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index f763f3f1d3..08b2167b88 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231105
+Version: 7.0NG.774-231106
 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 a20ff66110..322aef20dc 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231105"
+pandora_version="7.0NG.774-231106"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ecad72b23b..da4ef06822 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231105";
+my $pandora_build = "231106";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 2a91f6ef32..3213575814 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231105";
+my $pandora_build = "231106";
 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 bdabe04cc3..32adafc6e7 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 5dbf71bbf3..be7c9aeb71 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231105
+%define release     231106
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 77b14febc7..4f32160985 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231105"
+PI_BUILD="231106"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 0380aa6b08..8e434c74e7 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231105";
+my $version = "7.0NG.774 Build 231106";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 4254f0772d..2d951adc8e 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231105";
+my $version = "7.0NG.774 Build 231106";
 
 # save program name for logging
 my $progname = basename($0);

From 5486b500f06cbe0de625de8229c5ed6bc0ee64a7 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 6 Nov 2023 13:12:14 +0100
Subject: [PATCH 17/41] Add action ITSM in SNMP alert pandora_enterprise#12327

---
 .../godmode/alerts/configure_alert_action.php | 203 +----------
 .../godmode/snmpconsole/snmp_alert.php        |  27 +-
 pandora_console/include/javascript/alert.js   | 316 +++++++++++++++++-
 3 files changed, 353 insertions(+), 193 deletions(-)

diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 4883467c10..4718689da5 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -484,6 +484,7 @@ echo '</form>';
 
 ui_require_javascript_file('pandora_alerts');
 ui_require_javascript_file('tinymce', 'vendor/tinymce/tinymce/');
+ui_require_javascript_file('alert');
 ?>
 
 <script type="text/javascript">
@@ -500,194 +501,6 @@ $(document).ready (function () {
         render_command_description(command_description);
     }
 
-    function ajax_get_integria_custom_fields(ticket_type_id, values, recovery_values) {
-        var values = values || [];
-        var recovery_values = recovery_values || [];
-        var max_macro_fields = <?php echo $config['max_macro_fields']; ?>;
-
-        if (ticket_type_id === null || ticket_type_id === '' || (Array.isArray(values) && values.length === 0 && Array.isArray(recovery_values) && recovery_values.length === 0)) {
-            for (var i=8; i <= max_macro_fields; i++) {
-                $('[name=field'+i+'_value\\[\\]').val('');
-                $('[name=field'+i+'_recovery_value\\[\\]').val('');
-            }
-        }
-
-        // On ticket type change, hide all table rows and inputs corresponding to custom fields, regardless of what its type is.
-        for (var i=8; i <= max_macro_fields; i++) {
-            $('[name=field'+i+'_value\\[\\]').hide();
-            $('[name=field'+i+'_recovery_value\\[\\]').hide();
-            $('#table_macros-field'+i).hide();
-            $('[name=field'+i+'_value_container').hide();
-            $('[name=field'+i+'_recovery_value_container').hide();
-        }
-
-        jQuery.post(
-          "ajax.php",
-          {
-            page: "godmode/alerts/configure_alert_action",
-            get_integria_ticket_custom_types: 1,
-            ticket_type_id: ticket_type_id
-          },
-          function(data) {
-            var max_macro_fields = <?php echo $config['max_macro_fields']; ?>;
-            data.forEach(function(custom_field, key) {
-                var custom_field_key = key+8; // Custom fields start from field 8.
-
-                if (custom_field_key > max_macro_fields) {
-                    return;
-                }
-
-                // Display field row for current input.
-                var custom_field_row = $('#table_macros-field'+custom_field_key);
-                custom_field_row.show();
-
-                // Replace label text of field row for current input.
-                var label_html = $('#table_macros-field'+custom_field_key+' td').first().html();
-                var label_name = label_html.split('<br>')[0];
-                var new_html_content = custom_field_row.html().replace(label_name, custom_field.label);
-                custom_field_row.html(new_html_content);
-
-                switch (custom_field.type) {
-                    case 'CHECKBOX':
-                        var checkbox_selector = $('input[type="checkbox"][name=field'+custom_field_key+'_value\\[\\]]');
-                        var checkbox_recovery_selector = $('input[type="checkbox"][name=field'+custom_field_key+'_recovery_value\\[\\]]');
-
-                        checkbox_selector.on('change', function() {
-                            if (checkbox_selector.prop('checked')) {
-                                checkbox_selector.attr('value', "1");
-                            } else {
-                                checkbox_selector.attr('value', "0");
-                            }
-                        });
-
-                        checkbox_recovery_selector.on('change', function() {
-                            if (checkbox_recovery_selector.prop('checked')) {
-                                checkbox_recovery_selector.attr('value', "1");
-                            } else {
-                                checkbox_recovery_selector.attr('value', "0");
-                            }
-                        });
-
-                        if (typeof values[key] !== "undefined") {
-                            if (values[key] == 1) {
-                                checkbox_selector.prop('checked', true);
-                                checkbox_selector.attr('value', "1");
-                            } else {
-                                checkbox_selector.prop('checked', false);
-                                checkbox_selector.attr('value', "0");
-                            }
-                        }
-
-                        if (typeof recovery_values[key] !== "undefined") {
-                            if (recovery_values[key] == 1) {
-                                checkbox_recovery_selector.prop('checked', true);
-                                checkbox_recovery_selector.attr('value', "1");
-                            } else {
-                                checkbox_recovery_selector.prop('checked', false);
-                                checkbox_recovery_selector.attr('value', "0");
-                            }
-                        }
-
-                        $('[name=field'+custom_field_key+'_value_container]').show();
-                        $('[name=field'+custom_field_key+'_recovery_value_container]').show();
-                        $('input[type="checkbox"][name=field'+custom_field_key+'_value\\[\\]]').show();
-                        $('input[type="checkbox"][name=field'+custom_field_key+'_recovery_value\\[\\]]').show();
-                    break;
-                    case 'COMBO':
-                        var combo_input = $('select[name=field'+custom_field_key+'_value\\[\\]]');
-                        var combo_input_recovery = $('select[name=field'+custom_field_key+'_recovery_value\\[\\]]');
-
-                        combo_input.find('option').remove();
-                        combo_input_recovery.find('option').remove();
-
-                        var combo_values_array = custom_field.comboValue.split(',');
-                        
-                        combo_values_array.forEach(function(value) {
-                            combo_input.append($('<option>', {
-                                value: value,
-                                text: value
-                            }));
-
-                            combo_input_recovery.append($('<option>', {
-                                value: value,
-                                text: value
-                            }));
-                        });
-
-                        if (typeof values[key] !== "undefined") {
-                            combo_input.val(values[key]);
-                        }
-
-                        if (typeof recovery_values[key] !== "undefined") {
-                            combo_input_recovery.val(recovery_values[key]);
-                        }
-
-                        combo_input.show();
-                        combo_input_recovery.show();
-                    break;
-                    case 'DATE':
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_value\\[\\]]').removeClass("hasDatepicker");
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_recovery_value\\[\\]]').removeClass("hasDatepicker");
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_value\\[\\]]').datepicker("destroy");
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_recovery_value\\[\\]]').datepicker("destroy");
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_value\\[\\]]').show();
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_recovery_value\\[\\]]').show();
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_value\\[\\]]').datepicker({dateFormat: "<?php echo 'yy-mm-dd 00:00:00'; ?>"});
-                        $('input.datepicker[type="text"][name=field'+custom_field_key+'_recovery_value\\[\\]]').datepicker({dateFormat: "<?php echo 'yy-mm-dd 00:00:00'; ?>"});
-                        $.datepicker.setDefaults($.datepicker.regional[ "<?php echo get_user_language(); ?>"]);
-
-                        if (typeof values[key] !== "undefined") {
-                            $('input.datepicker[type="text"][name=field'+custom_field_key+'_value\\[\\]]').val(values[key]);
-                        }
-
-                        if (typeof recovery_values[key] !== "undefined") {
-                            $('input.datepicker[type="text"][name=field'+custom_field_key+'_recovery_value\\[\\]]').val(recovery_values[key]);
-                        }
-                    break;
-                    case 'NUMERIC':
-                        if (typeof values[key] !== "undefined") {
-                            $('input[type="number"][name=field'+custom_field_key+'_value\\[\\]]').val(values[key]);
-                        }
-
-                        if (typeof recovery_values[key] !== "undefined") {
-                            $('input[type="number"][name=field'+custom_field_key+'_recovery_value\\[\\]]').val(recovery_values[key]);
-                        }
-
-                        $('input[type="number"][name=field'+custom_field_key+'_value\\[\\]]').show();
-                        $('input[type="number"][name=field'+custom_field_key+'_recovery_value\\[\\]]').show();
-                    break;
-                    case 'TEXT':
-                        if (typeof values[key] !== "undefined") {
-                            $('input.normal[type="text"][name=field'+custom_field_key+'_value\\[\\]]').val(values[key]);
-                        }
-
-                        if (typeof recovery_values[key] !== "undefined") {
-                            $('input.normal[type="text"][name=field'+custom_field_key+'_recovery_value\\[\\]]').val(recovery_values[key]);
-                        }
-
-                        $('input.normal[type="text"][name=field'+custom_field_key+'_value\\[\\]]').show();
-                        $('input.normal[type="text"][name=field'+custom_field_key+'_recovery_value\\[\\]]').show();
-                    break;
-                    case 'TEXTAREA':
-                    default:
-                        if (typeof values[key] !== "undefined") {
-                            $('textarea[name=field'+custom_field_key+'_value\\[\\]]').val(values[key]);
-                        }
-
-                        if (typeof recovery_values[key] !== "undefined") {
-                            $('textarea[name=field'+custom_field_key+'_recovery_value\\[\\]]').val(recovery_values[key]);
-                        }
-
-                        $('textarea[name=field'+custom_field_key+'_value\\[\\]]').show();
-                        $('textarea[name=field'+custom_field_key+'_recovery_value\\[\\]]').show();
-                    break;
-                }
-            });
-          },
-          "json"
-        );
-    }
-
     $("#id_command").change (function () {
         values = Array ();
         // No se envia el valor del commando.
@@ -914,12 +727,22 @@ $(document).ready (function () {
                     }
 
                     if ($('#field5_value').val() !== '') {
-                        ajax_get_integria_custom_fields($('#field5_value').val(), integria_custom_fields_values, integria_custom_fields_rvalues);
+                        ajax_get_integria_custom_fields(
+                            $('#field5_value').val(),
+                            integria_custom_fields_values,
+                            integria_custom_fields_rvalues,
+                            max_macro_fields
+                        );
                         $('#field5_value').trigger('change');
                     }
 
                     $('#field5_value').on('change', function() {
-                        ajax_get_integria_custom_fields($(this).val());
+                        ajax_get_integria_custom_fields(
+                            $(this).val(),
+                            [],
+                            [],
+                            max_macro_fields
+                        );
                     });
                 }
 
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 2c139e4f21..99895b3464 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -2063,7 +2063,7 @@ if ($create_alert || $update_alert) {
     }
 
     // DIALOG ADD MORE ACTIONS.
-    echo '<div id="add_action_snmp-div" class="invisible left">';
+    echo '<div id="add_action_snmp-div" class="invisible">';
 
         echo '<form id="add_action_form" method="post">';
             echo '<table class="w100p">';
@@ -2212,6 +2212,7 @@ if ($create_alert || $update_alert) {
 
 ui_require_javascript_file('pandora', 'include/javascript/', true);
 ui_require_javascript_file('tinymce', 'vendor/tinymce/tinymce/');
+ui_require_javascript_file('alert');
 ?>
 <script language="javascript" type="text/javascript">
 
@@ -2287,6 +2288,7 @@ $(document).ready (function () {
             name: "content_type",
             value: "<?php echo $al_field4; ?>"
         })
+
         jQuery.post (<?php echo "'".ui_get_full_url('ajax.php', false, false, false)."'"; ?>,
             values,
             function (data, status) {
@@ -2317,6 +2319,26 @@ $(document).ready (function () {
                         }
                         $('#table_macros-field').show();
                     }
+
+                    if($("#alert_type option:selected").text() === "Create Pandora ITSM ticket") {
+                        // At start hide all rows and inputs corresponding to custom fields, regardless of what its type is.
+                        if (i>=8) {
+                            $('[name=field'+i+'_value\\[\\]').hide();
+                            $('[name=field'+i+'_recovery_value\\[\\]').hide();
+                            $('#table_macros-field'+i).hide();
+                            $('[name=field'+i+'_value_container').hide();
+                            $('[name=field'+i+'_recovery_value_container').hide();
+                        }
+
+                        if ($('#field5_value').val() !== '') {
+                            ajax_get_integria_custom_fields($('#field5_value').val(), [], [], max_fields);
+                            $('#field5_value').trigger('change');
+                        }
+
+                        $('#field5_value').on('change', function() {
+                            ajax_get_integria_custom_fields($(this).val(), [], [], max_fields);
+                        });
+                    }
                 }
             },
             "json"
@@ -2341,7 +2363,8 @@ $(document).ready (function () {
 });
 
 function show_add_action_snmp(id_alert_snmp) {
-    $("#add_action_snmp-div").hide()
+    $("#add_action_snmp-div")
+        .hide()
         .dialog ({
             resizable: true,
             draggable: true,
diff --git a/pandora_console/include/javascript/alert.js b/pandora_console/include/javascript/alert.js
index 435649833d..06f3223df7 100644
--- a/pandora_console/include/javascript/alert.js
+++ b/pandora_console/include/javascript/alert.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-/* global $, load_modal, generalShowMsg, confirmDialog */
+/* global $, load_modal, generalShowMsg, confirmDialog, jQuery */
 
 function allowDrop(ev) {
   ev.preventDefault();
@@ -172,3 +172,317 @@ function disabled_alert(settings) {
     }
   });
 }
+
+function ajax_get_integria_custom_fields(
+  ticket_type_id,
+  values,
+  recovery_values,
+  max_macro_fields
+) {
+  values = values || [];
+  recovery_values = recovery_values || [];
+
+  if (
+    ticket_type_id === null ||
+    ticket_type_id === "" ||
+    (Array.isArray(values) &&
+      values.length === 0 &&
+      Array.isArray(recovery_values) &&
+      recovery_values.length === 0)
+  ) {
+    for (let i = 8; i <= max_macro_fields; i++) {
+      $("[name=field" + i + "_value\\[\\]").val("");
+      $("[name=field" + i + "_recovery_value\\[\\]").val("");
+    }
+  }
+
+  // On ticket type change, hide all table rows and inputs corresponding to custom fields, regardless of what its type is.
+  for (let i = 8; i <= max_macro_fields; i++) {
+    $("[name=field" + i + "_value\\[\\]").hide();
+    $("[name=field" + i + "_recovery_value\\[\\]").hide();
+    $("#table_macros-field" + i).hide();
+    $("[name=field" + i + "_value_container").hide();
+    $("[name=field" + i + "_recovery_value_container").hide();
+  }
+
+  jQuery.post(
+    "ajax.php",
+    {
+      page: "godmode/alerts/configure_alert_action",
+      get_integria_ticket_custom_types: 1,
+      ticket_type_id: ticket_type_id
+    },
+    function(data) {
+      data.forEach(function(custom_field, key) {
+        var custom_field_key = key + 8; // Custom fields start from field 8.
+
+        if (custom_field_key > max_macro_fields) {
+          return;
+        }
+
+        // Display field row for current input.
+        var custom_field_row = $("#table_macros-field" + custom_field_key);
+        custom_field_row.show();
+
+        // Replace label text of field row for current input.
+        var label_html = $("#table_macros-field" + custom_field_key + " td")
+          .first()
+          .html();
+        var label_name = label_html.split("<br>")[0];
+        var new_html_content = custom_field_row
+          .html()
+          .replace(label_name, custom_field.label);
+        custom_field_row.html(new_html_content);
+
+        switch (custom_field.type) {
+          case "CHECKBOX":
+            var checkbox_selector = $(
+              'input[type="checkbox"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            );
+            var checkbox_recovery_selector = $(
+              'input[type="checkbox"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            );
+
+            checkbox_selector.on("change", function() {
+              if (checkbox_selector.prop("checked")) {
+                checkbox_selector.attr("value", "1");
+              } else {
+                checkbox_selector.attr("value", "0");
+              }
+            });
+
+            checkbox_recovery_selector.on("change", function() {
+              if (checkbox_recovery_selector.prop("checked")) {
+                checkbox_recovery_selector.attr("value", "1");
+              } else {
+                checkbox_recovery_selector.attr("value", "0");
+              }
+            });
+
+            if (typeof values[key] !== "undefined") {
+              if (values[key] == 1) {
+                checkbox_selector.prop("checked", true);
+                checkbox_selector.attr("value", "1");
+              } else {
+                checkbox_selector.prop("checked", false);
+                checkbox_selector.attr("value", "0");
+              }
+            }
+
+            if (typeof recovery_values[key] !== "undefined") {
+              if (recovery_values[key] == 1) {
+                checkbox_recovery_selector.prop("checked", true);
+                checkbox_recovery_selector.attr("value", "1");
+              } else {
+                checkbox_recovery_selector.prop("checked", false);
+                checkbox_recovery_selector.attr("value", "0");
+              }
+            }
+
+            $("[name=field" + custom_field_key + "_value_container]").show();
+            $(
+              "[name=field" + custom_field_key + "_recovery_value_container]"
+            ).show();
+            $(
+              'input[type="checkbox"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            ).show();
+            $(
+              'input[type="checkbox"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).show();
+            break;
+          case "COMBO":
+            var combo_input = $(
+              "select[name=field" + custom_field_key + "_value\\[\\]]"
+            );
+            var combo_input_recovery = $(
+              "select[name=field" + custom_field_key + "_recovery_value\\[\\]]"
+            );
+
+            combo_input.find("option").remove();
+            combo_input_recovery.find("option").remove();
+
+            var combo_values_array = custom_field.comboValue.split(",");
+
+            combo_values_array.forEach(function(value) {
+              combo_input.append(
+                $("<option>", {
+                  value: value,
+                  text: value
+                })
+              );
+
+              combo_input_recovery.append(
+                $("<option>", {
+                  value: value,
+                  text: value
+                })
+              );
+            });
+
+            if (typeof values[key] !== "undefined") {
+              combo_input.val(values[key]);
+            }
+
+            if (typeof recovery_values[key] !== "undefined") {
+              combo_input_recovery.val(recovery_values[key]);
+            }
+
+            combo_input.show();
+            combo_input_recovery.show();
+            break;
+          case "DATE":
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            ).removeClass("hasDatepicker");
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).removeClass("hasDatepicker");
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            ).datepicker("destroy");
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).datepicker("destroy");
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            ).show();
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).show();
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            ).datepicker({ dateFormat: "<?php echo 'yy-mm-dd 00:00:00'; ?>" });
+            $(
+              'input.datepicker[type="text"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).datepicker({ dateFormat: "<?php echo 'yy-mm-dd 00:00:00'; ?>" });
+            $.datepicker.setDefaults(
+              $.datepicker.regional["<?php echo get_user_language(); ?>"]
+            );
+
+            if (typeof values[key] !== "undefined") {
+              $(
+                'input.datepicker[type="text"][name=field' +
+                  custom_field_key +
+                  "_value\\[\\]]"
+              ).val(values[key]);
+            }
+
+            if (typeof recovery_values[key] !== "undefined") {
+              $(
+                'input.datepicker[type="text"][name=field' +
+                  custom_field_key +
+                  "_recovery_value\\[\\]]"
+              ).val(recovery_values[key]);
+            }
+            break;
+          case "NUMERIC":
+            if (typeof values[key] !== "undefined") {
+              $(
+                'input[type="number"][name=field' +
+                  custom_field_key +
+                  "_value\\[\\]]"
+              ).val(values[key]);
+            }
+
+            if (typeof recovery_values[key] !== "undefined") {
+              $(
+                'input[type="number"][name=field' +
+                  custom_field_key +
+                  "_recovery_value\\[\\]]"
+              ).val(recovery_values[key]);
+            }
+
+            $(
+              'input[type="number"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            ).show();
+            $(
+              'input[type="number"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).show();
+            break;
+          case "TEXT":
+            if (typeof values[key] !== "undefined") {
+              $(
+                'input.normal[type="text"][name=field' +
+                  custom_field_key +
+                  "_value\\[\\]]"
+              ).val(values[key]);
+            }
+
+            if (typeof recovery_values[key] !== "undefined") {
+              $(
+                'input.normal[type="text"][name=field' +
+                  custom_field_key +
+                  "_recovery_value\\[\\]]"
+              ).val(recovery_values[key]);
+            }
+
+            $(
+              'input.normal[type="text"][name=field' +
+                custom_field_key +
+                "_value\\[\\]]"
+            ).show();
+            $(
+              'input.normal[type="text"][name=field' +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).show();
+            break;
+          case "TEXTAREA":
+          default:
+            if (typeof values[key] !== "undefined") {
+              $("textarea[name=field" + custom_field_key + "_value\\[\\]]").val(
+                values[key]
+              );
+            }
+
+            if (typeof recovery_values[key] !== "undefined") {
+              $(
+                "textarea[name=field" +
+                  custom_field_key +
+                  "_recovery_value\\[\\]]"
+              ).val(recovery_values[key]);
+            }
+
+            $(
+              "textarea[name=field" + custom_field_key + "_value\\[\\]]"
+            ).show();
+            $(
+              "textarea[name=field" +
+                custom_field_key +
+                "_recovery_value\\[\\]]"
+            ).show();
+            break;
+        }
+      });
+    },
+    "json"
+  );
+}

From a0e1274ee6286d5c346ffc7e7c40913b9d8f1963 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Mon, 6 Nov 2023 13:30:49 +0100
Subject: [PATCH 18/41] Added server conf option for self monitoring agent name

---
 pandora_console/include/lib/TacticalView/Element.php | 8 +++++++-
 pandora_server/bin/pandora_server                    | 2 ++
 pandora_server/conf/pandora_server.conf.new          | 3 +++
 pandora_server/lib/PandoraFMS/Config.pm              | 6 ++++++
 pandora_server/lib/PandoraFMS/Core.pm                | 8 ++++----
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/lib/TacticalView/Element.php b/pandora_console/include/lib/TacticalView/Element.php
index 8e81d4fd15..a0a534a31e 100644
--- a/pandora_console/include/lib/TacticalView/Element.php
+++ b/pandora_console/include/lib/TacticalView/Element.php
@@ -79,11 +79,17 @@ class Element
     public function __construct(
         $ajax_controller='include/ajax/general_tactical_view.ajax'
     ) {
+        global $config;
         $this->interval = 0;
         $this->title = __('Default element');
         $this->ajaxController = $ajax_controller;
         // Without ACL.
-        $agent = db_get_row('tagente', 'nombre', 'pandora.internals', '*');
+        $agent_name = $config['self_monitoring_agent_name'];
+        if (empty($agent_name) === true) {
+            $agent_name = 'pandora.internals';
+        }
+
+        $agent = db_get_row('tagente', 'nombre', $agent_name, '*');
         if (is_array($agent) === true) {
             $this->monitoringAgent = $agent;
         }
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index eaf6f48968..619a00e1b6 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -818,6 +818,8 @@ sub main() {
 				&& $Config{"self_monitoring"} == 1
 				&& !is_metaconsole(\%Config)
 				&& time() - $thr_time_ref > $Config{'self_monitoring_interval'}) {
+				# Update agent name token.
+				pandora_set_tconfig_token($DBH, 'self_monitoring_agent_name', $Config{'self_monitoring_agent_name'});
 				$thr_time_ref = time();
 				pandora_thread_monitoring (\%Config, $DBH, \@Servers);
 			}
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index 33ab26d411..2e485501e4 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -422,6 +422,9 @@ self_monitoring 1
 # Self monitoring interval (in seconds).
 self_monitoring_interval 300
 
+# Self monitoring agent name. 
+self_monitoring_agent_name pandora.internals
+
 # Update parent from the agent xml
 
 update_parent 1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index da4ef06822..53911f5c3f 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -416,6 +416,9 @@ sub pandora_load_config {
 	# Self monitoring interval
 	$pa_config->{'self_monitoring_interval'} = 300; # 5.1SP1
 
+	# Self monitoring agent name.
+	$pa_config->{'self_monitoring_agent_name'} = 'pandora.internals'; # 7.774
+
 	# Process XML data files as a stack
 	$pa_config->{"dataserver_lifo"} = 0; # 5.0
 
@@ -1041,6 +1044,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^self_monitoring_interval\s+([0-9]*)/i) {
 			$pa_config->{'self_monitoring_interval'} = clean_blank($1);
 		}
+		elsif ($parametro =~ m/^self_monitoring_agent_name\s+(.*)/i) {
+			$pa_config->{'self_monitoring_agent_name'} = clean_blank($1);
+		}
 		elsif ($parametro =~ m/^update_parent\s+([0-1])/i) {
 			$pa_config->{'update_parent'} = clean_blank($1);
 		}
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index e047cd7500..afd3e8e865 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -6315,7 +6315,7 @@ sub pandora_self_monitoring ($$) {
 
 	my $xml_output = "";
 	
-	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='pandora.internals' agent_alias='pandora.internals' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
+	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='" . $pa_config->{"self_monitoring_agent_name"} . "' agent_alias='" . $pa_config->{"self_monitoring_agent_name"} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
 	$xml_output .=" <module>";
 	$xml_output .=" <name>Status</name>";
 	$xml_output .=" <type>generic_proc</type>";
@@ -6514,7 +6514,7 @@ sub pandora_self_monitoring ($$) {
 
 	$xml_output .= "</agent_data>";
 
-	my $filename = $pa_config->{"incomingdir"}."/pandora.internals.self".$utimestamp.".data";
+	my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{"self_monitoring_agent_name"}.".self".$utimestamp.".data";
 	open (XMLFILE, ">", $filename) or die "[FATAL] Could not open internal monitoring XML file for deploying monitorization at '$filename'";
 	print XMLFILE $xml_output;
 	close (XMLFILE);
@@ -6539,7 +6539,7 @@ sub pandora_thread_monitoring ($$$) {
 	# All trhead modules are "Status" module sons.
 	$module_parent = 'Status';
 
-	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='pandora.internals' agent_alias='pandora.internals' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
+	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='" . $pa_config->{'self_monitoring_agent_name'} . "' agent_alias='pandora.internals' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
 	foreach my $server (@{$servers}) {
 		my $producer_stats = $server->getProducerStats();
 		while (my ($tid, $stats) = each(%{$producer_stats})) {
@@ -6605,7 +6605,7 @@ sub pandora_thread_monitoring ($$$) {
 	}
 	$xml_output .= "</agent_data>";
 
-	my $filename = $pa_config->{"incomingdir"}."/pandora.internals.threads.".$utimestamp.".data";
+	my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'self_monitoring_agent_name'}.".threads.".$utimestamp.".data";
 	open (XMLFILE, ">", $filename) or die "[FATAL] Could not write to the thread monitoring XML file '$filename'";
 	print XMLFILE $xml_output;
 	close (XMLFILE);

From 17eca20235ce27b5ca460ed21cd6cd29703d3927 Mon Sep 17 00:00:00 2001
From: Rafael <rafael.ameijeiras@artica.es>
Date: Mon, 6 Nov 2023 15:52:43 +0100
Subject: [PATCH 19/41] 12415 adding utf8 encoding

---
 extras/pandora_gotty/deb/pandora_gotty/DEBIAN/control | 2 +-
 extras/pandora_gotty/pandora_gotty.spec               | 2 +-
 extras/pandora_gotty/src/pandora_gotty_exec.py        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/pandora_gotty/deb/pandora_gotty/DEBIAN/control b/extras/pandora_gotty/deb/pandora_gotty/DEBIAN/control
index f715ee1b49..fda06b3e36 100644
--- a/extras/pandora_gotty/deb/pandora_gotty/DEBIAN/control
+++ b/extras/pandora_gotty/deb/pandora_gotty/DEBIAN/control
@@ -1,6 +1,6 @@
 Source: pandora_gotty
 Section: utils
-Version: 1.0.0
+Version: 1.1.0
 Priority: optional
 Maintainer: PandoraFMS
 Build-Depends: debhelper (>= 12)
diff --git a/extras/pandora_gotty/pandora_gotty.spec b/extras/pandora_gotty/pandora_gotty.spec
index 813c9726c9..d322fae653 100644
--- a/extras/pandora_gotty/pandora_gotty.spec
+++ b/extras/pandora_gotty/pandora_gotty.spec
@@ -1,5 +1,5 @@
 %define name        pandora_gotty
-%define version     1.0
+%define version     1.1
 %define release     1%{?dist}
 Summary:            pandora_gptty for Pandora FMS
 Name:               %{name}
diff --git a/extras/pandora_gotty/src/pandora_gotty_exec.py b/extras/pandora_gotty/src/pandora_gotty_exec.py
index 1f7756745f..2444d88363 100644
--- a/extras/pandora_gotty/src/pandora_gotty_exec.py
+++ b/extras/pandora_gotty/src/pandora_gotty_exec.py
@@ -74,7 +74,7 @@ def exec_ssh (user:str, add:str, port:int):
     try:
         print("> Starting SSH connection...")
         ssh_command = f"ssh {user}@{add} -p {port}"  
-        subprocess.run(ssh_command, shell=True)
+        subprocess.run(ssh_command, shell=True, encoding='utf-8', text=True)
 
     except subprocess.CalledProcessError as e:
         raise SystemExit(e)
@@ -88,7 +88,7 @@ def exec_telnet (add:str, port:int):
     try:
         print("> Starting Telnet connection...")
         ssh_command = f"telnet -E {add} {port}"  
-        subprocess.run(ssh_command, shell=True)
+        subprocess.run(ssh_command, shell=True, encoding='utf-8', text=True)
 
     except subprocess.CalledProcessError as e:
         raise SystemExit(e)

From e516db1ef183305bfb2d35cbc0a17749ff4283ce Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 7 Nov 2023 01:00:29 +0100
Subject: [PATCH 20/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh    | 2 +-
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec     | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +-
 pandora_agents/unix/pandora_agent.spec            | 2 +-
 pandora_agents/unix/pandora_agent_installer       | 2 +-
 pandora_agents/win32/installer/pandora.mpi        | 2 +-
 pandora_agents/win32/pandora.cc                   | 2 +-
 pandora_agents/win32/versioninfo.rc               | 2 +-
 pandora_console/DEBIAN/control                    | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_console/include/config_process.php        | 2 +-
 pandora_console/install.php                       | 2 +-
 pandora_console/pandora_console.redhat.spec       | 2 +-
 pandora_console/pandora_console.rhel7.spec        | 2 +-
 pandora_console/pandora_console.spec              | 2 +-
 pandora_server/DEBIAN/control                     | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm           | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm      | 2 +-
 pandora_server/pandora_server.redhat.spec         | 2 +-
 pandora_server/pandora_server.spec                | 2 +-
 pandora_server/pandora_server_installer           | 2 +-
 pandora_server/util/pandora_db.pl                 | 2 +-
 pandora_server/util/pandora_manage.pl             | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 630cb879a1..e63567d459 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231106
+Version: 7.0NG.774-231107
 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 e495fd6a40..b2f9b8652a 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231106"
+pandora_version="7.0NG.774-231107"
 
 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 3201ed337b..ab8f9a996d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231106';
+use constant AGENT_BUILD => '231107';
 
 # 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 04766894d9..3f9c84767e 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 
 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 94572e700b..3b0fc9e492 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 
 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 22cb656200..d6722c8036 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 
 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 d2c5675164..7ada05ee2b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231106"
+PI_BUILD="231107"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 83674ed0b2..b83cdeca2b 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231106}
+{231107}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 96a79a12aa..9e57c9f62e 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231106")
+#define PANDORA_VERSION ("7.0NG.774 Build 231107")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3ef09dd2e6..d3dc406445 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231106))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231107))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1bbb3e3325..95fe521eea 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231106
+Version: 7.0NG.774-231107
 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 02dd0e1613..cf23a349d9 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231106"
+pandora_version="7.0NG.774-231107"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3115fc8631..8c68ac61e7 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 = 'PC231106';
+$build_version = 'PC231107';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 580ebe3d45..93b32c3e53 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231106';
+            $build = '231107';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index b308bdb11f..27854de63b 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 
 # 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 b95e39d8aa..d5c83ec92a 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 
 # 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 b695683a80..5890d727b8 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 08b2167b88..1f50325524 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231106
+Version: 7.0NG.774-231107
 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 322aef20dc..2ebf243309 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231106"
+pandora_version="7.0NG.774-231107"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index da4ef06822..ad478d8e8a 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231106";
+my $pandora_build = "231107";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 3213575814..6f53749d92 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231106";
+my $pandora_build = "231107";
 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 32adafc6e7..c17bc6bc75 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index be7c9aeb71..068f793e96 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231106
+%define release     231107
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 4f32160985..167deee016 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231106"
+PI_BUILD="231107"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 8e434c74e7..08c11f8082 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231106";
+my $version = "7.0NG.774 Build 231107";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2d951adc8e..4a94ed4fec 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231106";
+my $version = "7.0NG.774 Build 231107";
 
 # save program name for logging
 my $progname = basename($0);

From 7b7370659ebd18204a084dc08b83e932d7fb9af1 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 7 Nov 2023 11:11:08 +0100
Subject: [PATCH 21/41] Fix home screen external link pandora_enterprise#12413

---
 .../godmode/users/configure_user.php          | 83 ++-----------------
 .../godmode/users/user_management.php         | 55 ++++++++----
 2 files changed, 48 insertions(+), 90 deletions(-)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 08040f839c..c2089ab298 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -33,8 +33,6 @@ check_login();
 
 require_once $config['homedir'].'/vendor/autoload.php';
 
-use PandoraFMS\Dashboard\Manager;
-
 require_once $config['homedir'].'/include/functions_profile.php';
 require_once $config['homedir'].'/include/functions_users.php';
 require_once $config['homedir'].'/include/functions_groups.php';
@@ -1376,72 +1374,6 @@ if (is_metaconsole() === true) {
     );
 }
 
-$values = [
-    -1 => __('Use global conf'),
-    1  => __('Yes'),
-    0  => __('No'),
-];
-
-$home_screen = '<div class="label_select"><p class="edit_user_labels">'.__('Home screen').ui_print_help_tip(
-    __('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 to show agent detail view'),
-    true
-).'</p>';
-
-$dashboards = Manager::getDashboards(
-    -1,
-    -1,
-    false,
-    false,
-    $id_usr
-);
-
-$dashboards_aux = [];
-if ($dashboards === false) {
-    $dashboards = ['None' => 'None'];
-} else {
-    foreach ($dashboards as $key => $dashboard) {
-        $dashboards_aux[$dashboard['id']] = $dashboard['name'];
-    }
-}
-
-$home_screen .= '<div id="show_db" style="display: none; width: 100%;">';
-$home_screen .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true);
-$home_screen .= '</div>';
-
-$layouts = visual_map_get_user_layouts($config['id_user'], true);
-$layouts_aux = [];
-if ($layouts === false) {
-    $layouts_aux = ['None' => 'None'];
-} else {
-    foreach ($layouts as $layout) {
-        $layouts_aux[$layout] = $layout;
-    }
-}
-
-$home_screen .= '<div id="show_vc" style="display: none; width: 100%;">';
-$home_screen .= html_print_select(
-    $layouts_aux,
-    'visual_console',
-    $user_info['data_section'],
-    '',
-    '',
-    '',
-    true
-);
-$home_screen .= '</div>';
-
-$home_screen .= html_print_input_text(
-    'data_section',
-    $user_info['data_section'],
-    '',
-    60,
-    255,
-    true,
-    false
-);
-
-$home_screen = '';
-
 $size_pagination = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Block size for pagination').'</p>';
 $size_pagination .= html_print_input_text(
     'block_size',
@@ -2078,17 +2010,20 @@ if (is_metaconsole() === false) {
     }
 
     function show_data_section() {
-        var $section = $("#section").val();
-        var $allElements = $('div[id^="custom_home_screen_"]');
-        var $elementSelected = $('div[id="custom_home_screen_' + $section + '"]');
+        var section = $("#section").val();
+        if(section === 'other'){
+            section = 'external_link';
+        }
+        var allElements = $('div[id^="custom_home_screen_"]');
+        var elementSelected = $('div[id="custom_home_screen_' + section + '"]');
         // Hide all elements.
-        $allElements.each(function() {
+        allElements.each(function() {
             $(this).addClass('invisible');
             $(this).children().addClass('invisible');
         })
         // Show only the selected.
-        $elementSelected.removeClass('invisible');
-        $elementSelected.children().removeClass('invisible');
+        elementSelected.removeClass('invisible');
+        elementSelected.children().removeClass('invisible');
     }
 
     function switch_ehorus_conf() {
diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index 6d5f9bf18b..95def919c2 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -48,13 +48,44 @@ $homeScreenValues = [
 // Custom Home Screen controls.
 $customHomeScreenAddition = [];
 // Home screen. Dashboard.
-$customHomeScreenAddition[HOME_SCREEN_DASHBOARD] = html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true, false, true, 'w100p', false, 'width: 100%');
+$customHomeScreenAddition[HOME_SCREEN_DASHBOARD] = html_print_select(
+    $dashboards_aux,
+    'dashboard',
+    $user_info['data_section'],
+    '',
+    '',
+    '',
+    true,
+    false,
+    true,
+    'w100p',
+    false,
+    'width: 100%'
+);
 // Home screen. Visual consoles.
-$customHomeScreenAddition[HOME_SCREEN_VISUAL_CONSOLE] = html_print_select($layouts_aux, 'visual_console', $user_info['data_section'], '', '', '', true, false, true, 'w100p', false, 'width: 100%');
+$customHomeScreenAddition[HOME_SCREEN_VISUAL_CONSOLE] = html_print_select(
+    $layouts_aux,
+    'visual_console',
+    $user_info['data_section'],
+    '',
+    '',
+    '',
+    true,
+    false,
+    true,
+    'w100p',
+    false,
+    'width: 100%'
+);
 // Home screen. External link and Other.
-$customHomeScreenAddition[HOME_SCREEN_EXTERNAL_LINK] = html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true);
-$customHomeScreenAddition[HOME_SCREEN_OTHER] = html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true);
-
+$customHomeScreenAddition[HOME_SCREEN_EXTERNAL_LINK] = html_print_input_text(
+    'data_section',
+    $user_info['data_section'],
+    '',
+    60,
+    255,
+    true
+);
 $customHomeScreenDataField = '';
 foreach ($customHomeScreenAddition as $key => $customField) {
     $customHomeScreenDataField .= html_print_div(
@@ -576,7 +607,7 @@ $userManagementTable->data['fields_autorefreshTime'][0] .= ui_print_input_placeh
     true
 );
 
-// eHorus conf
+// EHorus conf.
 if (isset($config['ehorus_user_level_conf']) === true && (bool) $config['ehorus_user_level_conf'] === true) {
     $userManagementTable->data['captions_ehorus_user_level_enabled'][1] = __('Pandora RC user access enabled');
     $userManagementTable->data['fields_ehorus_user_level_enabled'][1] = html_print_checkbox_switch(
@@ -791,7 +822,7 @@ $userManagementTable->data['fields_addSettings'][0] = html_print_textarea(
     5,
     65,
     $user_info['comments'],
-    ($view_mode ? 'readonly="readonly"' : ''),
+    ($view_mode) ? 'readonly="readonly"' : '',
     true,
     ''
 );
@@ -945,15 +976,7 @@ $(document).ready(function () {
         $('#advanced-line1_looknfeel-1 > a').css('display', 'block');
     })
 
-    var ehorus_user_level_enabled = 
-    <?php
-    if (isset($user_info['ehorus_user_level_enabled']) === true) {
-                                            echo $user_info['ehorus_user_level_enabled'];
-    } else {
-        echo 0;
-    }
-    ?>
-                                    ;
+    var ehorus_user_level_enabled = '<?php echo (isset($user_info['ehorus_user_level_enabled']) === true) ? $user_info['ehorus_user_level_enabled'] : 0; ?>';
     var chk_ehorus_user_level_enabled = ehorus_user_level_enabled;
 
     if (ehorus_user_level_enabled == 0) {

From 65dbef9889eb8a30325b384aee72482585b8203f Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 7 Nov 2023 11:57:24 +0100
Subject: [PATCH 22/41] Fix list CV pagination pandora_enterprise#12414

---
 .../godmode/reporting/map_builder.php         | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 53db920b2b..d879bb5a5a 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -571,6 +571,7 @@ if (!$maps && is_metaconsole() === false) {
 }
 
 if ($maps || is_metaconsole() === true) {
+    $buttons = '';
     if ($vconsoles_write || $vconsoles_manage) {
         if (is_metaconsole() === false) {
             $actionUrl = 'index.php?sec=network&amp;sec2=godmode/reporting/visual_console_builder';
@@ -578,20 +579,22 @@ if ($maps || is_metaconsole() === true) {
             $actionUrl = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&action2=new&operation=new_visualmap&tab=data&pure='.$pure;
         }
 
-        echo '<form action="'.$actionUrl.'" method="post">';
-        html_print_input_hidden('edit_layout', 1);
+        $buttons .= '<form action="'.$actionUrl.'" method="post">';
+        $buttons .= html_print_input_hidden('edit_layout', 1, true);
 
-        html_print_action_buttons(
-            html_print_submit_button(
-                __('Create'),
-                '',
-                false,
-                [ 'icon' => 'next'],
-                true
-            ),
-            [ 'right_content' => $tablePagination ]
+        $buttons .= html_print_submit_button(
+            __('Create'),
+            '',
+            false,
+            [ 'icon' => 'next'],
+            true
         );
 
-        echo '</form>';
+        $buttons .= '</form>';
     }
+
+    html_print_action_buttons(
+        $buttons,
+        [ 'right_content' => $tablePagination ]
+    );
 }

From 267bbe88f4178697a7e948545f0a77743a6bcd4c Mon Sep 17 00:00:00 2001
From: rafael <rafael.ameijeiras@pandorafms.com>
Date: Tue, 7 Nov 2023 12:29:43 +0100
Subject: [PATCH 23/41] 12422 adding el9 spec for agent

---
 extras/pandora_update_version.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh
index 29dee8f0ce..06de8cc2b1 100755
--- a/extras/pandora_update_version.sh
+++ b/extras/pandora_update_version.sh
@@ -22,13 +22,16 @@ else
 fi
 SPEC_FILES="$CODEHOME/pandora_console/pandora_console.spec \
 $CODEHOME/pandora_agents/unix/pandora_agent.spec \
+$CODEHOME/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec \
+$CODEHOME/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec \
+$CODEHOME/pandora_agents/unix/pandora_agent.redhat_bin.spec \
+$CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \
 $CODEHOME/pandora_server/pandora_server.spec \
 $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.spec \
 $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.spec \
 $CODEHOME/pandora_console/pandora_console.redhat.spec \
 $CODEHOME/pandora_console/pandora_console.rhel7.spec \
 $CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \
-$CODEHOME/pandora_agents/unix/pandora_agent.redhat_bin.spec \
 $CODEHOME/pandora_server/pandora_server.redhat.spec \
 $PANDHOME_ENT/pandora_agents/pandora_agent.spec \
 $PANDHOME_ENT/pandora_server/pandora_server_enterprise.redhat.spec \

From 8f8e5ecf453a960fdf01abe3241ad8fb64920fc1 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 7 Nov 2023 13:18:44 +0100
Subject: [PATCH 24/41] #12376 multiple changes in general tactical view

---
 .../agentes/module_manager_editor_common.php  |   2 +-
 .../godmode/setup/setup_visuals.php           |   9 ++
 pandora_console/include/functions_config.php  |   8 +
 pandora_console/include/functions_graph.php   |  37 ++++-
 pandora_console/include/graphs/fgraph.php     |   6 +
 .../javascript/general_tactical_view.js       | 137 ++++++++++++++++++
 .../lib/TacticalView/GeneralTacticalView.php  |  17 +++
 .../lib/TacticalView/elements/Agents.php      |  17 +++
 .../lib/TacticalView/elements/Database.php    |   2 +
 .../lib/TacticalView/elements/Events.php      |  49 ++++---
 .../lib/TacticalView/elements/Groups.php      |  17 ++-
 .../elements/MonitoringElements.php           |  18 ++-
 .../lib/TacticalView/elements/Overview.php    |   4 +
 .../include/styles/general_tactical_view.css  |  26 +++-
 pandora_console/operation/events/events.php   |   5 +-
 pandora_console/views/tacticalView/view.php   | 120 +++++++--------
 16 files changed, 378 insertions(+), 96 deletions(-)

diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index ca74b7d171..de08a299de 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -1387,7 +1387,7 @@ $table_advanced->data['made_enabled'][0] = html_print_checkbox_switch(
     'made_enabled',
     1,
     (bool) $made_enabled,
-    false,
+    true,
     false,
     '',
     false,
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 6379f86d3a..4336da55b9 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -2129,6 +2129,15 @@ $table_other->data[$row][] = html_print_label_input_block(
     __('Data multiplier to use in graphs/data'),
     html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false)
 );
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Disable general statistics in main tactical view'),
+    html_print_checkbox_switch(
+        'disable_general_statistics',
+        1,
+        $config['disable_general_statistics'],
+        true
+    )
+);
 $row++;
 
 /*
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 1fe38aac0b..a09e3f1706 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1568,6 +1568,10 @@ function config_update_config()
                         $error_update[] = __('Use data multiplier');
                     }
 
+                    if (config_update_value('disable_general_statistics', get_parameter('disable_general_statistics', 0), true) === false) {
+                        $error_update[] = __('Disable general statistics');
+                    }
+
                     if (config_update_value('decimal_separator', (string) get_parameter('decimal_separator', '.'), true) === false) {
                         $error_update[] = __('Decimal separator');
                     } else {
@@ -3703,6 +3707,10 @@ function config_process_config()
         config_update_value('use_data_multiplier', '1');
     }
 
+    if (!isset($config['disable_general_statistics'])) {
+        config_update_value('disable_general_statistics', 0);
+    }
+
     if (!isset($config['command_snapshot'])) {
         config_update_value('command_snapshot', 1);
     }
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 3ba76b17d0..d1c31f95b0 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -27,6 +27,8 @@
  * ============================================================================
  */
 
+use Models\VisualConsole\Items\Percentile;
+
 require_once $config['homedir'].'/include/graphs/fgraph.php';
 require_once $config['homedir'].'/include/functions_reporting.php';
 require_once $config['homedir'].'/include/functions_agents.php';
@@ -2686,7 +2688,9 @@ function graph_agent_status(
     $return=false,
     $show_not_init=false,
     $data_agents=false,
-    $donut_narrow_graph=false
+    $donut_narrow_graph=false,
+    $onClick='',
+    $data_in_percentage=false,
 ) {
     global $config;
 
@@ -2766,6 +2770,25 @@ function graph_agent_status(
         'labels' => array_keys($data),
     ];
 
+    if (empty($onClick) === false) {
+        $options['onClick'] = $onClick;
+    }
+
+    if ($data_in_percentage === true) {
+        $percentages = [];
+        $total = array_sum($data);
+        foreach ($data as $key => $value) {
+            $percentage = (($value / $total) * 100);
+            if ($percentage < 1 && $percentage > 0) {
+                $percentage = 1;
+            }
+
+            $percentages[$key] = format_numeric($percentage, 0);
+        }
+
+        $data = $percentages;
+    }
+
     if ($donut_narrow_graph == true) {
         $out = ring_graph(
             $data,
@@ -4625,9 +4648,15 @@ function graph_nodata_image($options)
         return base64_encode($dataImg);
     }
 
-    $widthImage = '200px';
+    $style = '';
     if (isset($options['nodata_image']['width']) === true) {
-        $widthImage = $options['nodata_image']['width'];
+        $style .= 'width: '.$options['nodata_image']['width'].'; ';
+    } else {
+        $style .= 'width: 200px; ';
+    }
+
+    if (isset($options['nodata_image']['height']) === true) {
+        $style .= 'height: '.$options['nodata_image']['height'].'; ';
     }
 
     return html_print_image(
@@ -4635,7 +4664,7 @@ function graph_nodata_image($options)
         true,
         [
             'title' => __('No data'),
-            'style' => 'width: '.$widthImage.';',
+            'style' => $style,
         ]
     );
 }
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 5e5818357b..afb2154cfe 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -669,6 +669,12 @@ function get_build_setup_charts($type, $options, $data)
 
     $chart->setId($id);
 
+    if (isset($options['onClick']) === true
+        && empty($options['onClick']) === false
+    ) {
+        $chart->options()->setOnClick($options['onClick']);
+    }
+
     // Height is null maximum possible.
     if (isset($options['height']) === true
         && empty($options['height']) === false
diff --git a/pandora_console/include/javascript/general_tactical_view.js b/pandora_console/include/javascript/general_tactical_view.js
index b671c56103..5761f4b51f 100644
--- a/pandora_console/include/javascript/general_tactical_view.js
+++ b/pandora_console/include/javascript/general_tactical_view.js
@@ -73,8 +73,40 @@ $(document).ready(function() {
       $("#heatmap-title").html($(title).html());
     }
   });
+  rescaling();
+
+  $(window).on("resize", function() {
+    rescaling();
+  });
 });
 
+function showLabel(element, event, label) {
+  $(".label_heatmap").remove();
+  const tooltip = $(document.createElement("div"));
+  tooltip.html(label);
+  tooltip.attr("class", "label_heatmap");
+  $("#heatmap-group").append(tooltip);
+  var x = event.clientX;
+  var y = event.clientY;
+  tooltip.attr(
+    "style",
+    "position: fixed; top:" + (y + 15) + "px; left:" + (x + 20) + "px;"
+  );
+}
+
+function hideLabel() {
+  $(".label_heatmap").remove();
+}
+
+function rescaling() {
+  if (window.innerWidth < 1300) {
+    $(".trigger-100").attr("style", "width: 100%;");
+    $(".trigger-100").addClass("br-b");
+  } else {
+    $(".trigger-100").removeAttr("style");
+    $(".trigger-100").removeClass("br-b");
+  }
+}
 function autoRefresh(interval, id, method, php_class) {
   setInterval(() => {
     $.ajax({
@@ -92,3 +124,108 @@ function autoRefresh(interval, id, method, php_class) {
     });
   }, interval);
 }
+
+function redirectStatus(e, element) {
+  if (element.length > 0) {
+    switch (e.chart.legend.legendItems[element[0].index].text) {
+      case "Critical":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group=0&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status=1&sort_field=&sort=none&pure=`
+        );
+        break;
+
+      case "Warning":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group=0&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status=2&sort_field=&sort=none&pure=`
+        );
+        break;
+
+      case "Unknown":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group=0&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status=3&sort_field=&sort=none&pure=`
+        );
+        break;
+
+      case "Not init":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group=0&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status=5&sort_field=&sort=none&pure=`
+        );
+        break;
+
+      default:
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group=0&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status=-1&sort_field=&sort=none&pure=`
+        );
+        break;
+    }
+  }
+}
+
+function redirectHeatmap(view, id, id_agente = 0) {
+  switch (view) {
+    case "group":
+      window.location.assign(
+        `index.php?sec=view&sec2=godmode/groups/tactical&id_group=${id}`
+      );
+      break;
+
+    case "agent":
+      window.location.assign(
+        `index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=${id}`
+      );
+      break;
+
+    case "module":
+      if (id_agente > 0) {
+        window.location.assign(
+          `index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=${id_agente}&tab=module&id_agent_module=${id}&edit_module=1`
+        );
+      }
+      break;
+
+    default:
+      break;
+  }
+}
+
+function redirectAgentStatus(e, element) {
+  if (element.length > 0) {
+    switch (e.chart.legend.legendItems[element[0].index].text) {
+      case "No monitors":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/estado_agente`
+        );
+        break;
+
+      case "CRITICAL":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/estado_agente&status=1`
+        );
+        break;
+
+      case "WARNING":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/estado_agente&status=2`
+        );
+        break;
+
+      case "UKNOWN":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/estado_agente&status=3`
+        );
+        break;
+
+      case "NORMAL":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/estado_agente&status=0`
+        );
+        break;
+
+      default:
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/estado_agente`
+        );
+        break;
+    }
+  }
+}
diff --git a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
index 3bc2e45246..d61b748bca 100644
--- a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
+++ b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
@@ -50,6 +50,22 @@ class GeneralTacticalView
     }
 
 
+    /**
+     * Returns whether general statistics are disabled.
+     *
+     * @return boolean
+     */
+    public function disableGeneralStatistics():bool
+    {
+        global $config;
+        if (users_is_admin($config['id_user']) === true) {
+            return false;
+        } else {
+            return (bool) $config['disable_general_statistics'];
+        }
+    }
+
+
     /**
      * Instantiate all the elements that will build the dashboard
      *
@@ -109,6 +125,7 @@ class GeneralTacticalView
     {
         $data = [];
         $data['javascript'] = $this->javascript();
+        $data['disableGeneralStatistics'] = $this->disableGeneralStatistics();
         $data = array_merge($data, $this->elements);
         View::render(
             'tacticalView/view',
diff --git a/pandora_console/include/lib/TacticalView/elements/Agents.php b/pandora_console/include/lib/TacticalView/elements/Agents.php
index 97063ec300..a0e14313e0 100644
--- a/pandora_console/include/lib/TacticalView/elements/Agents.php
+++ b/pandora_console/include/lib/TacticalView/elements/Agents.php
@@ -429,12 +429,29 @@ class Agents extends Element
             'cutout'       => 80,
             'nodata_image' => ['width' => '80%'],
             'colors'       => $colors,
+            'onClick'      => 'redirectAgentStatus',
         ];
+
+        // To avoid that if a value is too small it is not seen.
+        $percentages = [];
+        $total = array_sum($data);
+        foreach ($data as $key => $value) {
+            $percentage = (($value / $total) * 100);
+            if ($percentage < 1 && $percentage > 0) {
+                $percentage = 1;
+            }
+
+            $percentages[$key] = format_numeric($percentage, 0);
+        }
+
+        $data = $percentages;
+
         $pie = ring_graph($data, $options);
         $output = html_print_div(
             [
                 'content' => $pie,
                 'style'   => 'margin: 0 auto; max-width: 80%; max-height: 220px;',
+                'class'   => 'clickable',
             ],
             true
         );
diff --git a/pandora_console/include/lib/TacticalView/elements/Database.php b/pandora_console/include/lib/TacticalView/elements/Database.php
index 21f8053163..4c0d3a5368 100644
--- a/pandora_console/include/lib/TacticalView/elements/Database.php
+++ b/pandora_console/include/lib/TacticalView/elements/Database.php
@@ -34,7 +34,9 @@ class Database extends Element
      */
     public function __construct()
     {
+        global $config;
         parent::__construct();
+        include_once $config['homedir'].'/include/graphs/fgraph.php';
         $this->title = __('Database');
         $this->ajaxMethods = [
             'getStatus',
diff --git a/pandora_console/include/lib/TacticalView/elements/Events.php b/pandora_console/include/lib/TacticalView/elements/Events.php
index a7f9970ee3..1c87f4cc9e 100644
--- a/pandora_console/include/lib/TacticalView/elements/Events.php
+++ b/pandora_console/include/lib/TacticalView/elements/Events.php
@@ -57,23 +57,13 @@ class Events extends Element
     {
         global $config;
         $id_groups = array_keys(users_get_groups($config['id_user'], 'AR', false));
-        if (in_array(0, $id_groups) === false) {
-            foreach ($id_groups as $key => $id_group) {
-                if ((bool) check_acl_restricted_all($config['id_user'], $id_group, 'AR') === false) {
-                    unset($id_groups[$key]);
-                }
-            }
-        }
-
-        if (users_can_manage_group_all() === true) {
-            $id_groups[] = 0;
-        }
-
         $id_groups = implode(',', $id_groups);
         $event_view_h = (int) ($config['event_view_hr'] > 24) ? 24 : $config['event_view_hr'];
         $time_events = ($event_view_h * 3600);
         $intervalh = (time() - $time_events);
-        $sql = 'SELECT utimestamp from tevento WHERE utimestamp >= '.$intervalh.' ORDER BY utimestamp DESC;';
+        $sql = 'SELECT utimestamp
+                FROM tevento
+                WHERE utimestamp >= '.$intervalh.' AND id_grupo IN ('.$id_groups.') ORDER BY utimestamp DESC;';
         $rows = db_process_sql($sql);
         $cut_seconds = ($time_events / 24);
         $now = (time() - 300);
@@ -377,6 +367,13 @@ class Events extends Element
         $data = [];
         $colors = [];
         foreach ($rows as $key => $row) {
+            if ($row['criticity'] != EVENT_CRIT_CRITICAL
+                && $row['criticity'] != EVENT_CRIT_NORMAL
+                && $row['criticity'] != EVENT_CRIT_WARNING
+            ) {
+                continue;
+            }
+
             switch ($row['criticity']) {
                 case EVENT_CRIT_CRITICAL:
                     $label = __('CRITICAL');
@@ -394,9 +391,7 @@ class Events extends Element
                 break;
 
                 default:
-                    $colors[] = COL_UNKNOWN;
-                    $label = __('UNKNOWN');
-                break;
+                continue;
             }
 
             $labels[] = $this->controlSizeText($label);
@@ -410,6 +405,21 @@ class Events extends Element
             'nodata_image' => ['width' => '100%'],
             'colors'       => $colors,
         ];
+
+        // To avoid that if a value is too small it is not seen.
+        $percentages = [];
+        $total = array_sum($data);
+        foreach ($data as $key => $value) {
+            $percentage = (($value / $total) * 100);
+            if ($percentage < 1 && $percentage > 0) {
+                $percentage = 1;
+            }
+
+            $percentages[$key] = format_numeric($percentage, 0);
+        }
+
+        $data = $percentages;
+
         $pie = ring_graph($data, $options);
         $output = html_print_div(
             [
@@ -448,9 +458,10 @@ class Events extends Element
                 'style'                          => 'width: 90%;',
                 'ajax_url'                       => 'operation/events/events',
                 'ajax_data'                      => [
-                    'get_events'   => 1,
-                    'compact_date' => 1,
-                    'external_url' => 1,
+                    'get_events'         => 1,
+                    'compact_date'       => 1,
+                    'external_url'       => 1,
+                    'compact_name_event' => 1,
                 ],
                 'order'                          => [
                     'field'     => 'timestamp',
diff --git a/pandora_console/include/lib/TacticalView/elements/Groups.php b/pandora_console/include/lib/TacticalView/elements/Groups.php
index 82b0f358b1..dfb40fb79d 100644
--- a/pandora_console/include/lib/TacticalView/elements/Groups.php
+++ b/pandora_console/include/lib/TacticalView/elements/Groups.php
@@ -118,7 +118,6 @@ class Groups extends Element
             return graph_nodata_image(['width' => '400']);
         }
 
-        $groups = $modules;
         // Best square.
         $high = (float) max($width, $height);
         $low = 0.0;
@@ -147,7 +146,7 @@ class Groups extends Element
         $x = 0;
         $y = 0;
         $cont = 1;
-        foreach ($groups as $key => $value) {
+        foreach ($modules as $key => $value) {
             $module_id = $value['id_agente_modulo'];
             $db_status = modules_get_agentmodule_status($module_id);
             $module_value = modules_get_last_value($module_id);
@@ -183,10 +182,16 @@ class Groups extends Element
                 break;
             }
 
+            $redirect = '';
+            if (check_acl($config['id_user'], 0, 'AW')) {
+                $redirect = 'onclick="redirectHeatmap(\'module\', '.$module_id.', '.$value['id_agente'].')"';
+            }
+
             $heatmap .= sprintf(
-                '<rect id="%s" x="%s" style="stroke-width:1;stroke:#ffffff" y="%s" row="%s" rx="3" ry="3" col="%s" width="%s" height="%s" class="scuare-status %s_%s"></rect>',
+                '<rect id="%s" x="%s" onmousemove="showLabel(this, event, \'%s\')" onmouseleave="hideLabel()" '.$redirect.' style="stroke-width:1;stroke:#ffffff" y="%s" row="%s" rx="3" ry="3" col="%s" width="%s" height="%s" class="scuare-status %s_%s"></rect>',
                 'rect_'.$cont,
                 $x,
+                $value['nombre'],
                 $y,
                 $row,
                 $column,
@@ -350,9 +355,10 @@ class Groups extends Element
             }
 
             $heatmap .= sprintf(
-                '<rect id="%s" x="%s" style="stroke-width:1;stroke:#ffffff" y="%s" row="%s" rx="3" ry="3" col="%s" width="%s" height="%s" class="scuare-status %s_%s"></rect>',
+                '<rect id="%s" x="%s" onmousemove="showLabel(this, event, \'%s\')" onmouseleave="hideLabel()" onclick="redirectHeatmap(\'agent\', '.$value['id_agente'].')" style="stroke-width:1;stroke:#ffffff" y="%s" row="%s" rx="3" ry="3" col="%s" width="%s" height="%s" class="scuare-status %s_%s"></rect>',
                 'rect_'.$cont,
                 $x,
+                $value['alias'],
                 $y,
                 $row,
                 $column,
@@ -490,9 +496,10 @@ class Groups extends Element
             }
 
             $heatmap .= sprintf(
-                '<rect id="%s" x="%s" style="stroke-width:1;stroke:#ffffff" y="%s" row="%s" rx="3" ry="3" col="%s" width="%s" height="%s" class="scuare-status %s_%s"></rect>',
+                '<rect id="%s" x="%s" onmousemove="showLabel(this, event, \'%s\')" onmouseleave="hideLabel()" onclick="redirectHeatmap(\'group\', '.$value['_id_'].')" style="stroke-width:1;stroke:#ffffff" y="%s" row="%s" rx="3" ry="3" col="%s" width="%s" height="%s" class="scuare-status %s_%s"></rect>',
                 'rect_'.$cont,
                 $x,
+                $value['_name_'],
                 $y,
                 $row,
                 $column,
diff --git a/pandora_console/include/lib/TacticalView/elements/MonitoringElements.php b/pandora_console/include/lib/TacticalView/elements/MonitoringElements.php
index eece06f65f..8a572219bd 100644
--- a/pandora_console/include/lib/TacticalView/elements/MonitoringElements.php
+++ b/pandora_console/include/lib/TacticalView/elements/MonitoringElements.php
@@ -75,7 +75,10 @@ class MonitoringElements extends Element
                 'display'  => false,
             ],
             'cutout'       => 80,
-            'nodata_image' => ['width' => '100%'],
+            'nodata_image' => [
+                'width'  => '100%',
+                'height' => '90%',
+            ],
         ];
         $pie = ring_graph($data, $options);
         $output = html_print_div(
@@ -139,7 +142,10 @@ class MonitoringElements extends Element
                 'display'  => false,
             ],
             'cutout'       => 80,
-            'nodata_image' => ['width' => '100%'],
+            'nodata_image' => [
+                'width'  => '100%',
+                'height' => '90%',
+            ],
         ];
         $pie = ring_graph($data, $options);
         $output = html_print_div(
@@ -208,7 +214,10 @@ class MonitoringElements extends Element
                 'display'  => false,
             ],
             'cutout'       => 80,
-            'nodata_image' => ['width' => '100%'],
+            'nodata_image' => [
+                'width'  => '100%',
+                'height' => '90%',
+            ],
         ];
         $pie = ring_graph($data, $options);
         $output = html_print_div(
@@ -230,11 +239,12 @@ class MonitoringElements extends Element
      */
     public function getMonitoringStatusGraph():string
     {
-        $pie = graph_agent_status(false, '', '', true, true, false, true);
+        $pie = graph_agent_status(false, '', '', true, true, false, true, 'redirectStatus', true);
         $output = html_print_div(
             [
                 'content' => $pie,
                 'style'   => 'margin: 0 auto; max-width: 80%; max-height: 220px;',
+                'class'   => 'clickable',
             ],
             true
         );
diff --git a/pandora_console/include/lib/TacticalView/elements/Overview.php b/pandora_console/include/lib/TacticalView/elements/Overview.php
index 1e9534b652..6234887e94 100644
--- a/pandora_console/include/lib/TacticalView/elements/Overview.php
+++ b/pandora_console/include/lib/TacticalView/elements/Overview.php
@@ -36,6 +36,7 @@ class Overview extends Element
     {
         global $config;
         parent::__construct();
+        include_once $config['homedir'].'/include/graphs/fgraph.php';
         if (is_ajax() === true) {
             include_once $config['homedir'].'/include/functions_servers.php';
         }
@@ -163,6 +164,9 @@ class Overview extends Element
             if ($info['limit'] > $info['count']) {
                 $used = round(($info['count'] / $info['limit']) * 100);
                 $free = (100 - $used);
+            } else if ($info['limit'] <= $info['count']) {
+                $free = 0;
+                $used = 100;
             } else {
                 $free = 100;
                 $used = 0;
diff --git a/pandora_console/include/styles/general_tactical_view.css b/pandora_console/include/styles/general_tactical_view.css
index 0a7f6bdd67..24997f8f17 100644
--- a/pandora_console/include/styles/general_tactical_view.css
+++ b/pandora_console/include/styles/general_tactical_view.css
@@ -23,11 +23,12 @@
   align-items: stretch;
 }
 .col-12 {
-  width: 100%;
+  width: 99%;
 }
 .col-6,
 .col-xl-6 {
   width: 50%;
+  flex: 1;
   display: flex;
   flex-wrap: nowrap;
   flex-direction: column;
@@ -58,6 +59,9 @@
   border-radius: 10px;
   height: 100%;
   max-width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
 }
 .br-l {
   border-left: 1px solid #e5e9ed;
@@ -325,6 +329,22 @@ table.dataTable thead th {
   background-color: #ec7176;
 }
 
+#svg rect {
+  cursor: pointer;
+}
+
+.trigger-100 {
+  display: flex;
+  flex-direction: column;
+}
+.label_heatmap {
+  position: absolute;
+  background-color: #757575;
+  color: white;
+  padding: 2px 5px;
+  border-radius: 5px;
+}
+
 @media (max-width: 1636px) {
   .col-xl-6 {
     width: 100%;
@@ -344,9 +364,7 @@ table.dataTable thead th {
   .col-7 {
     width: 56%;
   }
-  .col-5 {
-    width: 41%;
-  }
+
   .flex-nowrap {
     flex-wrap: nowrap !important;
   }
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 4c3eae145e..86f8d43a27 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -342,6 +342,7 @@ if (is_ajax() === true) {
     $table_id = get_parameter('table_id', '');
     $groupRecursion = (bool) get_parameter('groupRecursion', false);
     $compact_date = (int) get_parameter('compact_date', 0);
+    $compact_name_event = (int) get_parameter('compact_name_event', 0);
 
     // Datatables offset, limit.
     $start = (int) get_parameter('start', 0);
@@ -471,7 +472,7 @@ if (is_ajax() === true) {
 
                 $data = array_reduce(
                     $events,
-                    function ($carry, $item) use ($table_id, &$redirection_form_id, $filter, $compact_date, $external_url) {
+                    function ($carry, $item) use ($table_id, &$redirection_form_id, $filter, $compact_date, $external_url, $compact_name_event) {
                         global $config;
 
                         $tmp = (object) $item;
@@ -518,7 +519,7 @@ if (is_ajax() === true) {
 
                         $tmp->evento = ui_print_truncate_text(
                             $tmp->evento,
-                            'description',
+                            (empty($compact_name_event) === true) ? 'description' : GENERIC_SIZE_TEXT,
                             false,
                             true,
                             false,
diff --git a/pandora_console/views/tacticalView/view.php b/pandora_console/views/tacticalView/view.php
index e09e5f16ae..a7fad1ee86 100644
--- a/pandora_console/views/tacticalView/view.php
+++ b/pandora_console/views/tacticalView/view.php
@@ -41,32 +41,34 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="br-t">
-                                    <div class="padding10">
-                                        <span class="subtitle">
-                                            <?php echo __('License usage'); ?>
-                                        </span>
-                                        <?php echo $Overview->getLicenseUsageGraph(); ?>
+                                <?php if ($disableGeneralStatistics === false) : ?>
+                                    <div class="br-t">
+                                        <div class="padding10">
+                                            <span class="subtitle">
+                                                <?php echo __('License usage'); ?>
+                                            </span>
+                                            <?php echo $Overview->getLicenseUsageGraph(); ?>
+                                        </div>
                                     </div>
-                                </div>
+                                <?php endif; ?>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row flex-nowrap">
+            <div class="row flex-nowrap height_100p">
                 <div class="col-7 pdd_5px">
                     <div class="container">
                         <div class="title">
                             <?php echo $MonitoringElements->title; ?>
                         </div>
-                        <div class="content br-t">
-                            <div class="row">
+                        <div class="content br-t height_100p">
+                            <div class="row height_50p">
                                 <div class="col-6 br-r br-b">
                                     <div class="subtitle link padding10 padding2">
-                                        <?php echo __('Top-10 Tags'); ?> <a href="index.php?sec=gusuarios&sec2=godmode/tag/tag"><?php echo __('Info'); ?></a>
+                                        <?php echo __('Status (%)'); ?> <a href="index.php?sec=view&sec2=operation/agentes/estado_agente"><?php echo __('Info'); ?></a>
                                     </div>
-                                    <?php echo $MonitoringElements->getTagsGraph(); ?>
+                                    <?php echo $MonitoringElements->getMonitoringStatusGraph(); ?>
                                 </div>
                                 <div class="col-6 br-b">
                                     <div class="subtitle link padding10 padding2">
@@ -75,12 +77,12 @@
                                     <?php echo $MonitoringElements->getModuleGroupGraph(); ?>
                                 </div>
                             </div>
-                            <div class="row">
+                            <div class="row height_50p">
                                 <div class="col-6">
                                     <div class="subtitle link padding10 padding2">
-                                        <?php echo __('Status'); ?> <a href="index.php?sec=view&sec2=operation/agentes/estado_agente"><?php echo __('Info'); ?></a>
+                                        <?php echo __('Top-10 Tags'); ?> <a href="index.php?sec=gusuarios&sec2=godmode/tag/tag"><?php echo __('Info'); ?></a>
                                     </div>
-                                    <?php echo $MonitoringElements->getMonitoringStatusGraph(); ?>
+                                    <?php echo $MonitoringElements->getTagsGraph(); ?>
                                 </div>
                                 <div class="col-6 br-l">
                                     <div class="subtitle link padding10 padding2">
@@ -165,6 +167,7 @@
                         </div>
                     </div>
                 </div>
+                <?php if ($disableGeneralStatistics === false) : ?>
                 <div class="col-6">
                     <div class="container mrgn_5px" id="logStorage">
                         <div class="title br-b">
@@ -184,7 +187,7 @@
                                 <?php echo $LogStorage->getTotalSources(); ?>
                             </div>
                         </div>
-                        <div class="row">
+                        <div class="row height_100p">
                             <div class="col-6 br-r">
                                 <div class="subtitle">
                                     <?php echo __('Stored data'); ?>
@@ -221,6 +224,7 @@
                         </div>
                     </div>
                 </div>
+                <?php endif; ?>
             </div>
         </div>
     </div>
@@ -236,13 +240,13 @@
                         <div class="subtitle">
                             <?php echo __('Currently triggered'); ?>
                         </div>
-                        <?php echo $Alerts->getCurrentlyTriggered(); ?>
+                        <a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&status_alert=fired"><?php echo $Alerts->getCurrentlyTriggered(); ?></a>
                     </div>
                     <div class="col-6 br-l">
                         <div class="subtitle">
                             <?php echo __('Active alerts'); ?>
                         </div>
-                        <?php echo $Alerts->getActiveAlerts(); ?>
+                        <a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list"><?php echo $Alerts->getActiveAlerts(); ?></a>
                     </div>
                 </div>
                 <?php if ($Alerts->checkAclUserList() === true) : ?>
@@ -261,13 +265,13 @@
                     <div class="title br-b">
                         <?php echo $Events->title; ?>
                     </div>
-                    <div class="row">
-                        <div class="col-8 br-r">
+                    <div class="row" id="auto-rescaling">
+                        <div class="col-8 br-r trigger-100">
                             <div class="subtitle link padding10 padding2">
                                 <?php echo __('Number of events per hour ('.$config['event_view_hr'].' hrs)'); ?></b> <a href="index.php?sec=eventos&sec2=operation/events/events&filter[event_view_hr]=24&filter[tag_with]=WyIwIl0=&filter[tag_without]=WyIwIl0="><?php echo __('Info'); ?></a>
                             </div>
                             <div id="events-last-24"><?php echo $Events->loading(); ?></div>
-                            <div class="row br-t h100p">
+                            <div class="row br-t h100p observer">
                                 <div class="col-4 br-r">
                                     <div class="subtitle padding10 padding2">
                                         <?php echo __('Criticality'); ?></b>
@@ -276,7 +280,7 @@
                                 </div>
                                 <div class="col-4 br-r">
                                     <div class="subtitle padding10 padding2">
-                                        <?php echo __('Status'); ?></b>
+                                        <?php echo __('Status (%)'); ?></b>
                                     </div>
                                     <div id="events-status-validate"><?php echo $Events->loading(); ?></div>
                                 </div>
@@ -288,7 +292,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-4">
+                        <div class="col-4 trigger-100">
                             <div class="subtitle link padding10 padding2">
                                 <?php echo __('Active events ('.$config['event_view_hr'].' hrs)'); ?></b> <a href="index.php?sec=eventos&sec2=operation/events/events"><?php echo __('Info'); ?></a>
                             </div>
@@ -333,7 +337,7 @@
                         </div>
                         <?php echo $Agents->getOperatingSystemGraph(); ?>
                         <div class="subtitle padding10 padding2 br-t">
-                            <?php echo __('Status'); ?></b>
+                            <?php echo __('Status (%)'); ?></b>
                         </div>
                         <?php echo $Agents->getStatusGraph(); ?>
                     </div>
@@ -341,41 +345,43 @@
             </div>
         </div>
         <div class="col-xl-6">
-            <div class="container mrgn_5px">
-                <div class="title br-b">
-                    <?php echo $Configurations->title; ?>
-                </div>
-                <div class="row br-b flex-nowrap">
-                    <a href="index.php?sec=view&sec2=operation/agentes/group_view" class="col-3 flex flex-column center pdd_20px br-r">
-                        <?php echo $Configurations->getTotalGroups(); ?>
-                    </a>
-                    <a href="index.php?sec=view&sec2=extensions/agents_modules" class="col-3 flex flex-column center pdd_20px br-r">
-                        <?php echo $Configurations->getTotalModules(); ?>
-                    </a>
-                    <?php if (enterprise_installed() === true) : ?>
-                        <a href="index.php?sec=gmodules&sec2=enterprise/godmode/policies/policies" class="col-3 flex flex-column center pdd_20px br-r">
-                            <?php echo $Configurations->getTotalPolicies(); ?>
+            <?php if ($disableGeneralStatistics === false) : ?>
+                <div class="container mrgn_5px">
+                    <div class="title br-b">
+                        <?php echo $Configurations->title; ?>
+                    </div>
+                    <div class="row br-b flex-nowrap">
+                        <a href="index.php?sec=view&sec2=operation/agentes/group_view" class="col-3 flex flex-column center pdd_20px br-r">
+                            <?php echo $Configurations->getTotalGroups(); ?>
                         </a>
-                    <?php endif; ?>
-                    <a href="index.php?sec=gservers&sec2=godmode/servers/plugin" class="col-3 flex flex-column center pdd_20px">
-                        <?php echo $Configurations->getTotalRemotePlugins(); ?>
-                    </a>
+                        <a href="index.php?sec=view&sec2=extensions/agents_modules" class="col-3 flex flex-column center pdd_20px br-r">
+                            <?php echo $Configurations->getTotalModules(); ?>
+                        </a>
+                        <?php if (enterprise_installed() === true) : ?>
+                            <a href="index.php?sec=gmodules&sec2=enterprise/godmode/policies/policies" class="col-3 flex flex-column center pdd_20px br-r">
+                                <?php echo $Configurations->getTotalPolicies(); ?>
+                            </a>
+                        <?php endif; ?>
+                        <a href="index.php?sec=gservers&sec2=godmode/servers/plugin" class="col-3 flex flex-column center pdd_20px">
+                            <?php echo $Configurations->getTotalRemotePlugins(); ?>
+                        </a>
+                    </div>
+                    <div class="row flex-nowrap br-b">
+                        <a href="index.php?sec=templates&sec2=godmode/modules/manage_module_templates" class="col-4 flex flex-column center pdd_20px br-r">
+                            <?php echo $Configurations->getTotalModuleTemplate(); ?>
+                        </a>
+                        <a href="index.php?sec=view&sec2=operation/agentes/estado_agente&status=5" class="col-4 flex flex-column center pdd_20px br-r">
+                            <?php echo $Configurations->getNotInitModules(); ?>
+                        </a>
+                        <a href="index.php?sec=view&sec2=operation/agentes/estado_agente&status=3" class="col-4 flex flex-column center pdd_20px br-r">
+                            <?php echo $Configurations->getTotalUnknowAgents(); ?>
+                        </a>
+                        <a href="index.php?sec=eventos&sec2=operation/events/events" class="col-4 flex flex-column center pdd_20px">
+                            <?php echo $Configurations->getTotalEvents(); ?>
+                        </a>
+                    </div>
                 </div>
-                <div class="row flex-nowrap br-b">
-                    <a href="index.php?sec=templates&sec2=godmode/modules/manage_module_templates" class="col-4 flex flex-column center pdd_20px br-r">
-                        <?php echo $Configurations->getTotalModuleTemplate(); ?>
-                    </a>
-                    <a href="index.php?sec=view&sec2=operation/agentes/estado_agente&status=5" class="col-4 flex flex-column center pdd_20px br-r">
-                        <?php echo $Configurations->getNotInitModules(); ?>
-                    </a>
-                    <a href="index.php?sec=view&sec2=operation/agentes/estado_agente&status=3" class="col-4 flex flex-column center pdd_20px br-r">
-                        <?php echo $Configurations->getTotalUnknowAgents(); ?>
-                    </a>
-                    <a href="index.php?sec=eventos&sec2=operation/events/events" class="col-4 flex flex-column center pdd_20px">
-                        <?php echo $Configurations->getTotalEvents(); ?>
-                    </a>
-                </div>
-            </div>
+            <?php endif; ?>
             <?php if ($ScheduledDowntime->checkAcl() === true) : ?>
                 <div class="container mrgn_5px">
                     <div class="title br-b">

From 76721a9445ba50e5a9e1a9fe1bc2d56a5ed55789 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 7 Nov 2023 13:20:08 +0100
Subject: [PATCH 25/41] Fix home screen external link pandora_enterprise#12413

---
 .../godmode/users/user_management.php         | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index 95def919c2..8d9efea97b 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -26,6 +26,8 @@
  * ============================================================================
  */
 
+use PandoraFMS\Dashboard\Manager;
+
 // Load global vars.
 global $config;
 
@@ -45,6 +47,23 @@ $homeScreenValues = [
     HOME_SCREEN_DASHBOARD      => __('Dashboard'),
 ];
 
+$dashboards = Manager::getDashboards(
+    -1,
+    -1,
+    false,
+    false,
+    $id_usr
+);
+
+$dashboards_aux = [];
+if ($dashboards === false) {
+    $dashboards = ['None' => 'None'];
+} else {
+    foreach ($dashboards as $key => $dashboard) {
+        $dashboards_aux[$dashboard['id']] = $dashboard['name'];
+    }
+}
+
 // Custom Home Screen controls.
 $customHomeScreenAddition = [];
 // Home screen. Dashboard.
@@ -62,6 +81,17 @@ $customHomeScreenAddition[HOME_SCREEN_DASHBOARD] = html_print_select(
     false,
     'width: 100%'
 );
+
+$layouts = visual_map_get_user_layouts($config['id_user'], true);
+$layouts_aux = [];
+if ($layouts === false) {
+    $layouts_aux = ['None' => 'None'];
+} else {
+    foreach ($layouts as $layout) {
+        $layouts_aux[$layout] = $layout;
+    }
+}
+
 // Home screen. Visual consoles.
 $customHomeScreenAddition[HOME_SCREEN_VISUAL_CONSOLE] = html_print_select(
     $layouts_aux,

From cacb524ece2b15c2947ae089c33459392a6c5dd6 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 7 Nov 2023 13:28:35 +0100
Subject: [PATCH 26/41] #12376 changed label in new token

---
 pandora_console/godmode/setup/setup_visuals.php | 2 +-
 pandora_console/include/functions_config.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 4336da55b9..d6a1719cd8 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -2130,7 +2130,7 @@ $table_other->data[$row][] = html_print_label_input_block(
     html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false)
 );
 $table_other->data[$row][] = html_print_label_input_block(
-    __('Disable general statistics in main tactical view'),
+    __('Hide general stats for non admin users in tactical view'),
     html_print_checkbox_switch(
         'disable_general_statistics',
         1,
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index a09e3f1706..9731851a24 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1569,7 +1569,7 @@ function config_update_config()
                     }
 
                     if (config_update_value('disable_general_statistics', get_parameter('disable_general_statistics', 0), true) === false) {
-                        $error_update[] = __('Disable general statistics');
+                        $error_update[] = __('Hide general stats for non admin users in tactical view');
                     }
 
                     if (config_update_value('decimal_separator', (string) get_parameter('decimal_separator', '.'), true) === false) {

From c81b42cc952a0cf265e479f7951bfb4e28fb28b7 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 7 Nov 2023 16:17:13 +0100
Subject: [PATCH 27/41] Remove filter group for alert pandora_enterprise#12423

---
 .../agentes/alerts_status.functions.php       | 77 ++-----------------
 .../operation/agentes/alerts_status.php       |  1 -
 2 files changed, 6 insertions(+), 72 deletions(-)

diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php
index 2e54b2f941..a4fa0eeecf 100755
--- a/pandora_console/operation/agentes/alerts_status.functions.php
+++ b/pandora_console/operation/agentes/alerts_status.functions.php
@@ -56,7 +56,7 @@ function validateAlert($ids)
 }
 
 
-function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby=false, $tag_filter=false, $action_filter=false, $return=false, $strict_user=false, $access='AR')
+function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false, $tag_filter=false, $action_filter=false, $return=false, $strict_user=false, $access='AR')
 {
     global $config;
     include_once $config['homedir'].'/include/functions_tags.php';
@@ -69,29 +69,6 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
     $table->size[1] = '33%';
     $table->size[2] = '33%';
     $table->data = [];
-    $table->data[0][0] = html_print_label_input_block(
-        __('Group'),
-        html_print_select_groups(
-            $config['id_user'],
-            $access,
-            true,
-            'ag_group',
-            $id_group,
-            '',
-            '',
-            '',
-            true,
-            false,
-            false,
-            '',
-            false,
-            '',
-            false,
-            false,
-            'id_grupo',
-            $strict_user
-        )
-    );
 
     $alert_status_filter = [];
     $alert_status_filter['all_enabled'] = __('All (Enabled)');
@@ -104,7 +81,7 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
     $alert_standby['1'] = __('Standby on');
     $alert_standby['0'] = __('Standby off');
 
-    $table->data[0][1] = html_print_label_input_block(
+    $table->data[0][0] = html_print_label_input_block(
         __('Status'),
         html_print_select(
             $alert_status_filter,
@@ -142,12 +119,12 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
         );
     }
 
-    $table->data[0][2] = html_print_label_input_block(
+    $table->data[0][1] = html_print_label_input_block(
         __('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true),
         $callbackTag
     );
 
-    $table->data[1][0] = html_print_label_input_block(
+    $table->data[0][2] = html_print_label_input_block(
         __('Free text for search').ui_print_help_tip(
             __('Filter by agent name, module name, template name or action name'),
             true
@@ -155,7 +132,7 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
         html_print_input_text('free_search', $free_search, '', 20, 40, true)
     );
 
-    $table->data[1][1] = html_print_label_input_block(
+    $table->data[1][0] = html_print_label_input_block(
         __('Standby'),
         html_print_select(
             $alert_standby,
@@ -174,7 +151,7 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
     );
 
     $alert_action = alerts_get_alert_actions_filter();
-    $table->data[1][2] = html_print_label_input_block(
+    $table->data[1][1] = html_print_label_input_block(
         __('Action'),
         html_print_select(
             $alert_action,
@@ -200,45 +177,3 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
         echo $data;
     }
 }
-
-
-function printFormFilterAlertAgent($agent_view_page, $free_search, $id_agent, $return=false)
-{
-    $table_filter = new stdClass();
-    $table_filter->width = '100%';
-
-    if ($agent_view_page === true) {
-        $table_filter->class = 'info_table';
-        $table_filter->styleTable = 'border-radius: 0;padding: 0;margin: 0;';
-        $free_search_name = 'free_search_alert';
-    } else {
-        $table_filter->class = 'databox filters';
-        $free_search_name = 'free_search';
-    }
-
-    $table_filter->style = [];
-    $table_filter->style[0] = 'font-weight: bold';
-    $table_filter->data = [];
-
-    $table_filter->data[0][0] = __('Free text for search (*):').ui_print_help_tip(
-        __('Filter by module name, template name or action name'),
-        true
-    );
-
-    $table_filter->data[0][0] .= '<span class="mrgn_lft_10px">'.html_print_input_text(
-        $free_search_name,
-        $free_search,
-        '',
-        20,
-        100,
-        true
-    ).'</span>';
-
-    $form = html_print_table($table_filter, true);
-
-    if ($return === true) {
-        return $form;
-    } else {
-        echo $form;
-    }
-}
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index a7ce53646c..3a0afc10d5 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -430,7 +430,6 @@ if ($agent_view_page === true) {
             'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar',
             'form'                => [
                 'html' => printFormFilterAlert(
-                    $id_group,
                     $disabled,
                     $free_search,
                     $url,

From 2d3f30974fd3d6de3b82dfa101312818100b7bbc Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 8 Nov 2023 01:00:25 +0100
Subject: [PATCH 28/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 4 ++--
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 4 ++--
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e63567d459..43dd282881 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231107
+Version: 7.0NG.774-231108
 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 b2f9b8652a..b5f0984fc4 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231107"
+pandora_version="7.0NG.774-231108"
 
 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 ab8f9a996d..44c032504b 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231107';
+use constant AGENT_BUILD => '231108';
 
 # 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 3f9c84767e..f32130c825 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index 1615f10ae1..905f42240b 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -4,8 +4,8 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
-%define version     7.0NG.773.3
-%define release     230919
+%define version     7.0NG.774
+%define release     231108
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index 0f63a6d626..b81dfabb64 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -4,8 +4,8 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
-%define version     7.0NG.773.3
-%define release     230919
+%define version     7.0NG.774
+%define release     231108
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 3b0fc9e492..0961de9751 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 
 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 d6722c8036..a073668d48 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 
 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 7ada05ee2b..a4c7c4dab9 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231107"
+PI_BUILD="231108"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b83cdeca2b..819ac19d42 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231107}
+{231108}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 9e57c9f62e..3724085695 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231107")
+#define PANDORA_VERSION ("7.0NG.774 Build 231108")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d3dc406445..3826481a1c 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231107))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231108))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 95fe521eea..a72475b9e0 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231107
+Version: 7.0NG.774-231108
 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 cf23a349d9..218d44986e 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231107"
+pandora_version="7.0NG.774-231108"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8c68ac61e7..91729f7c8a 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 = 'PC231107';
+$build_version = 'PC231108';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 93b32c3e53..de999bb92d 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231107';
+            $build = '231108';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 27854de63b..513030b432 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 
 # 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 d5c83ec92a..f0e85d7714 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 
 # 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 5890d727b8..cf27dffb23 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 1f50325524..ecb0d593a9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231107
+Version: 7.0NG.774-231108
 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 2ebf243309..2df4676124 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231107"
+pandora_version="7.0NG.774-231108"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ad478d8e8a..adeeb2afab 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231107";
+my $pandora_build = "231108";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 6f53749d92..92e53fc818 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231107";
+my $pandora_build = "231108";
 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 c17bc6bc75..ced71627ab 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 068f793e96..10f7c27059 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231107
+%define release     231108
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 167deee016..cbe62fa053 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231107"
+PI_BUILD="231108"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 08c11f8082..e473dec36f 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231107";
+my $version = "7.0NG.774 Build 231108";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 4a94ed4fec..1f54391bf4 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231107";
+my $version = "7.0NG.774 Build 231108";
 
 # save program name for logging
 my $progname = basename($0);

From 679386a964c5d909fb967117db5acaf5ce922fd8 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Wed, 8 Nov 2023 10:38:33 +0100
Subject: [PATCH 29/41] #12322 fix pagination

---
 pandora_console/godmode/setup/os.list.php | 31 ++++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 20d1b41561..27ae4e82f2 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -97,6 +97,24 @@ try {
             'column_names'        => $column_names,
             'ajax_url'            => 'include/ajax/os',
             'ajax_data'           => ['method' => 'drawOSTable'],
+            'pagination_options'  => [
+                [
+                    $config['block_size'],
+                    10,
+                    25,
+                    100,
+                    200,
+                    500,
+                ],
+                [
+                    $config['block_size'],
+                    10,
+                    25,
+                    100,
+                    200,
+                    500,
+                ],
+            ],
             'ajax_postprocess'    => 'process_datatables_item(item)',
             'no_sortable_columns' => [
                 -1,
@@ -137,6 +155,10 @@ if (is_metaconsole() === true) {
         true
     );
     $buttons .= '</form>';
+} else {
+    $buttons .= '<form method="post" action="index.php?sec=gagente&sec2=godmode/setup/os&tab=manage_os&action=edit">';
+    $buttons .= html_print_submit_button(__('Create OS'), 'update_button', false, ['icon' => 'next'], true);
+    $buttons .= '</form>';
 }
 
 html_print_action_buttons(
@@ -150,15 +172,6 @@ html_print_action_buttons(
 
 echo '<div id="aux" class="invisible"></div>';
 
-echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/setup/os&tab=manage_os&action=edit">';
-
-html_print_action_buttons(
-    html_print_submit_button(__('Create OS'), 'update_button', false, ['icon' => 'next'], true),
-    ['type' => 'form_action']
-);
-
-echo '</form>';
-
 ?>
 <script language="javascript" type="text/javascript">
     function process_datatables_item(item) {

From 9ccb6a98c6ed2c04e7484500b9c31a8e938a4e62 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 8 Nov 2023 12:49:45 +0100
Subject: [PATCH 30/41] fix alert details pandora_enterprise#12423

---
 .../agentes/alerts_status.functions.php       | 50 ++++++++++++++++---
 .../operation/agentes/alerts_status.php       | 11 +++-
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php
index a4fa0eeecf..372a97ccba 100755
--- a/pandora_console/operation/agentes/alerts_status.functions.php
+++ b/pandora_console/operation/agentes/alerts_status.functions.php
@@ -56,8 +56,18 @@ function validateAlert($ids)
 }
 
 
-function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false, $tag_filter=false, $action_filter=false, $return=false, $strict_user=false, $access='AR')
-{
+function printFormFilterAlert(
+    $id_group,
+    $filter,
+    $free_search,
+    $alert_agent_view,
+    $filter_standby=false,
+    $tag_filter=false,
+    $action_filter=false,
+    $return=false,
+    $strict_user=false,
+    $access='AR'
+) {
     global $config;
     include_once $config['homedir'].'/include/functions_tags.php';
 
@@ -70,6 +80,32 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
     $table->size[2] = '33%';
     $table->data = [];
 
+    if ($alert_agent_view === false) {
+        $table->data[0][0] = html_print_label_input_block(
+            __('Group'),
+            html_print_select_groups(
+                $config['id_user'],
+                $access,
+                true,
+                'ag_group',
+                $id_group,
+                '',
+                '',
+                '',
+                true,
+                false,
+                false,
+                '',
+                false,
+                '',
+                false,
+                false,
+                'id_grupo',
+                $strict_user
+            )
+        );
+    }
+
     $alert_status_filter = [];
     $alert_status_filter['all_enabled'] = __('All (Enabled)');
     $alert_status_filter['all'] = __('All');
@@ -81,7 +117,7 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
     $alert_standby['1'] = __('Standby on');
     $alert_standby['0'] = __('Standby off');
 
-    $table->data[0][0] = html_print_label_input_block(
+    $table->data[0][1] = html_print_label_input_block(
         __('Status'),
         html_print_select(
             $alert_status_filter,
@@ -119,12 +155,12 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
         );
     }
 
-    $table->data[0][1] = html_print_label_input_block(
+    $table->data[0][2] = html_print_label_input_block(
         __('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true),
         $callbackTag
     );
 
-    $table->data[0][2] = html_print_label_input_block(
+    $table->data[1][0] = html_print_label_input_block(
         __('Free text for search').ui_print_help_tip(
             __('Filter by agent name, module name, template name or action name'),
             true
@@ -132,7 +168,7 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
         html_print_input_text('free_search', $free_search, '', 20, 40, true)
     );
 
-    $table->data[1][0] = html_print_label_input_block(
+    $table->data[1][1] = html_print_label_input_block(
         __('Standby'),
         html_print_select(
             $alert_standby,
@@ -151,7 +187,7 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
     );
 
     $alert_action = alerts_get_alert_actions_filter();
-    $table->data[1][1] = html_print_label_input_block(
+    $table->data[1][2] = html_print_label_input_block(
         __('Action'),
         html_print_select(
             $alert_action,
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 3a0afc10d5..c99a687e33 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -405,6 +405,12 @@ if ($agent_view_page === true) {
         ]
     );
 } else {
+    $tab = get_parameter('tab', 'main');
+    $alert_agent_view = false;
+    if ($tab == 'alert') {
+        $alert_agent_view = true;
+    }
+
     ui_print_datatable(
         [
             'id'                  => 'alerts_status_datatable',
@@ -430,9 +436,10 @@ if ($agent_view_page === true) {
             'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar',
             'form'                => [
                 'html' => printFormFilterAlert(
+                    $id_group,
                     $disabled,
                     $free_search,
-                    $url,
+                    $alert_agent_view,
                     $filter_standby,
                     $tag_filter,
                     true,
@@ -440,7 +447,7 @@ if ($agent_view_page === true) {
                     $strict_user
                 ),
             ],
-            'start_disabled'      => true,
+            'start_disabled'      => !$alert_agent_view,
         ]
     );
 }

From 7223423dc79acd120e05a23f20a8f1fb98d9cdda Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Wed, 8 Nov 2023 13:15:05 +0100
Subject: [PATCH 31/41] #12376 fixed color group and fixed status color in
 heatmap

---
 .../include/lib/TacticalView/elements/Groups.php         | 9 +++++++--
 pandora_console/views/tacticalView/view.php              | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/lib/TacticalView/elements/Groups.php b/pandora_console/include/lib/TacticalView/elements/Groups.php
index dfb40fb79d..4fe07b743a 100644
--- a/pandora_console/include/lib/TacticalView/elements/Groups.php
+++ b/pandora_console/include/lib/TacticalView/elements/Groups.php
@@ -148,11 +148,16 @@ class Groups extends Element
         $cont = 1;
         foreach ($modules as $key => $value) {
             $module_id = $value['id_agente_modulo'];
-            $db_status = modules_get_agentmodule_status($module_id);
+            $module_status = db_get_row(
+                'tagente_estado',
+                'id_agente_modulo',
+                $module_id,
+            );
+
             $module_value = modules_get_last_value($module_id);
             $status = '';
             $title = '';
-            modules_get_status($module_id, $db_status, $module_value, $status, $title);
+            modules_get_status($module_id, $module_status['estado'], $module_value, $status, $title);
             switch ($status) {
                 case STATUS_MODULE_NO_DATA:
                     // Not init status.
diff --git a/pandora_console/views/tacticalView/view.php b/pandora_console/views/tacticalView/view.php
index a7fad1ee86..308c9626e9 100644
--- a/pandora_console/views/tacticalView/view.php
+++ b/pandora_console/views/tacticalView/view.php
@@ -246,7 +246,7 @@
                         <div class="subtitle">
                             <?php echo __('Active alerts'); ?>
                         </div>
-                        <a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list"><?php echo $Alerts->getActiveAlerts(); ?></a>
+                        <a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&status_alert=all_enabled"><?php echo $Alerts->getActiveAlerts(); ?></a>
                     </div>
                 </div>
                 <?php if ($Alerts->checkAclUserList() === true) : ?>

From 3132fabef9c98bb7ffb756ca07edfe190eae66d2 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Wed, 8 Nov 2023 13:36:43 +0100
Subject: [PATCH 32/41] #12376 fixed only enabled alerts in tactical view

---
 pandora_console/include/functions_alerts.php                | 6 +++++-
 .../include/lib/TacticalView/elements/Alerts.php            | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 2c738a6578..94dcb97f6c 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -22,7 +22,7 @@ require_once $config['homedir'].'/include/functions_modules.php';
 require_once $config['homedir'].'/include/functions_users.php';
 
 
-function alerts_get_alerts($id_group=0, $free_search='', $status='all', $standby=-1, $acl=false, $total=false, $id_agent=0)
+function alerts_get_alerts($id_group=0, $free_search='', $status='all', $standby=-1, $acl=false, $total=false, $id_agent=0, $only_enabled=false)
 {
     $sql = '';
     $alerts = [];
@@ -121,6 +121,10 @@ function alerts_get_alerts($id_group=0, $free_search='', $status='all', $standby
     // Only enabled agent.
     $sql .= ' AND t3.disabled = 0';
 
+    if ($only_enabled === true) {
+        $sql .= ' AND t0.disabled = 0';
+    }
+
     $row_alerts = db_get_all_rows_sql($sql);
 
     if ($total) {
diff --git a/pandora_console/include/lib/TacticalView/elements/Alerts.php b/pandora_console/include/lib/TacticalView/elements/Alerts.php
index 1c4388e708..44dfb83f4b 100644
--- a/pandora_console/include/lib/TacticalView/elements/Alerts.php
+++ b/pandora_console/include/lib/TacticalView/elements/Alerts.php
@@ -83,7 +83,7 @@ class Alerts extends Element
      */
     public function getActiveAlerts():string
     {
-        $total = alerts_get_alerts(0, '', 'all', -1, 'AR', true);
+        $total = alerts_get_alerts(0, '', 'all', -1, 'AR', true, 0, true);
         return html_print_div(
             [
                 'content' => format_numeric($total, 0),

From fac64ef19085f861c94f007610ec1786c523d4d0 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Wed, 8 Nov 2023 14:10:49 +0100
Subject: [PATCH 33/41] #12322 datatables length black color

---
 pandora_console/include/styles/pandora.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 759acca415..7c740bba2b 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -10328,7 +10328,7 @@ select:focus {
 }
 
 .dataTables_length > label {
-  color: #fff;
+  color: #000;
 }
 
 input[type="button"],

From a4df24d7b4b5c5a6fcfb7bdbb8a30fe926a1a1e8 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 8 Nov 2023 16:25:25 +0100
Subject: [PATCH 34/41] fix discovery network scan pandora_enterprise#12377

---
 pandora_console/godmode/servers/discovery.php | 120 ------------------
 1 file changed, 120 deletions(-)

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

From ea0a0969b8dc4d564065d807b1e92f2606a19d4c Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 9 Nov 2023 01:01:09 +0100
Subject: [PATCH 35/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 43dd282881..0c05769108 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231108
+Version: 7.0NG.774-231109
 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 b5f0984fc4..d212bc536a 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231108"
+pandora_version="7.0NG.774-231109"
 
 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 44c032504b..9f0a621c2d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231108';
+use constant AGENT_BUILD => '231109';
 
 # 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 f32130c825..0ab43c15e6 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index 905f42240b..45252ce7e0 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index b81dfabb64..6380bef911 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 0961de9751..3aa0826a85 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 
 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 a073668d48..3a881d6ef0 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 
 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 a4c7c4dab9..22914722c0 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231108"
+PI_BUILD="231109"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 819ac19d42..1450f07b03 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231108}
+{231109}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3724085695..cfeb7baf5c 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231108")
+#define PANDORA_VERSION ("7.0NG.774 Build 231109")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3826481a1c..f19b432539 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231108))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231109))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index a72475b9e0..7403624c45 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231108
+Version: 7.0NG.774-231109
 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 218d44986e..68059db575 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231108"
+pandora_version="7.0NG.774-231109"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 91729f7c8a..db1649d48d 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 = 'PC231108';
+$build_version = 'PC231109';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index de999bb92d..59f67e4851 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231108';
+            $build = '231109';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 513030b432..51d3b44679 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 
 # 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 f0e85d7714..ddf1ebe835 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 
 # 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 cf27dffb23..487527f4d3 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index ecb0d593a9..126d562ba5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231108
+Version: 7.0NG.774-231109
 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 2df4676124..c444672afd 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231108"
+pandora_version="7.0NG.774-231109"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d0a72043b1..308993560a 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231108";
+my $pandora_build = "231109";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 92e53fc818..4dfd57e88d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231108";
+my $pandora_build = "231109";
 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 ced71627ab..fed656b96e 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 10f7c27059..bf515277fb 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231108
+%define release     231109
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index cbe62fa053..7b901ebc82 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231108"
+PI_BUILD="231109"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e473dec36f..0d656819bc 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231108";
+my $version = "7.0NG.774 Build 231109";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 1f54391bf4..ec9272f2df 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231108";
+my $version = "7.0NG.774 Build 231109";
 
 # save program name for logging
 my $progname = basename($0);

From 2ba09b4b4832a9f2f560c3f85c6ced702a6e1795 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 10 Nov 2023 01:00:18 +0100
Subject: [PATCH 36/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 0c05769108..d9a53a352c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231109
+Version: 7.0NG.774-231110
 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 d212bc536a..37ffed7ef4 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231109"
+pandora_version="7.0NG.774-231110"
 
 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 9f0a621c2d..af158e5a2b 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231109';
+use constant AGENT_BUILD => '231110';
 
 # 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 0ab43c15e6..233ff34321 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index 45252ce7e0..422a58cada 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index 6380bef911..a96b086f09 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 3aa0826a85..7e78f19d4b 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 
 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 3a881d6ef0..6aa7de6e11 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 
 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 22914722c0..67c3bf45a4 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231109"
+PI_BUILD="231110"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1450f07b03..79d7921e7f 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231109}
+{231110}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index cfeb7baf5c..35a5222e45 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231109")
+#define PANDORA_VERSION ("7.0NG.774 Build 231110")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index f19b432539..e0b8bf6b3a 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231109))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231110))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 7403624c45..1ebf70a92a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231109
+Version: 7.0NG.774-231110
 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 68059db575..3f2767142b 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231109"
+pandora_version="7.0NG.774-231110"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index db1649d48d..d76b22cdc0 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 = 'PC231109';
+$build_version = 'PC231110';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 59f67e4851..c491a87f14 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231109';
+            $build = '231110';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 51d3b44679..32626c0010 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 
 # 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 ddf1ebe835..962d15e87a 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 
 # 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 487527f4d3..fb91735be3 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 126d562ba5..7939f14b67 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231109
+Version: 7.0NG.774-231110
 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 c444672afd..6e93256111 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231109"
+pandora_version="7.0NG.774-231110"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 308993560a..ab7c609eb8 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231109";
+my $pandora_build = "231110";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4dfd57e88d..f89c94d529 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231109";
+my $pandora_build = "231110";
 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 fed656b96e..defc3395a9 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index bf515277fb..89ee72bad1 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231109
+%define release     231110
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7b901ebc82..bac143e029 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231109"
+PI_BUILD="231110"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 0d656819bc..92cb8a3d32 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231109";
+my $version = "7.0NG.774 Build 231110";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ec9272f2df..2822f5cb74 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231109";
+my $version = "7.0NG.774 Build 231110";
 
 # save program name for logging
 my $progname = basename($0);

From 8ca94d40969e39929b48f6a01d30b3c8742f5f85 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Fri, 10 Nov 2023 10:47:26 +0100
Subject: [PATCH 37/41] #11126 fixed normal link graph

---
 pandora_console/include/javascript/general_tactical_view.js | 6 ++++++
 .../include/lib/TacticalView/elements/Overview.php          | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/javascript/general_tactical_view.js b/pandora_console/include/javascript/general_tactical_view.js
index 5761f4b51f..d1de902c25 100644
--- a/pandora_console/include/javascript/general_tactical_view.js
+++ b/pandora_console/include/javascript/general_tactical_view.js
@@ -152,6 +152,12 @@ function redirectStatus(e, element) {
         );
         break;
 
+      case "Normal":
+        window.location.assign(
+          `index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group=0&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status=0&sort_field=&sort=none&pure=`
+        );
+        break;
+
       default:
         window.location.assign(
           `index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group=0&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status=-1&sort_field=&sort=none&pure=`
diff --git a/pandora_console/include/lib/TacticalView/elements/Overview.php b/pandora_console/include/lib/TacticalView/elements/Overview.php
index 7290f6b079..6234887e94 100644
--- a/pandora_console/include/lib/TacticalView/elements/Overview.php
+++ b/pandora_console/include/lib/TacticalView/elements/Overview.php
@@ -35,7 +35,6 @@ class Overview extends Element
     public function __construct()
     {
         global $config;
-        include_once $config['homedir'].'/include/graphs/fgraph.php';
         parent::__construct();
         include_once $config['homedir'].'/include/graphs/fgraph.php';
         if (is_ajax() === true) {

From 61759da3e0c5fd626e5ddcf02fef011748842865 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 11 Nov 2023 01:00:21 +0100
Subject: [PATCH 38/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index d9a53a352c..83ce6935ff 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231110
+Version: 7.0NG.774-231111
 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 37ffed7ef4..731c8e8f2d 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231110"
+pandora_version="7.0NG.774-231111"
 
 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 af158e5a2b..d376156484 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231110';
+use constant AGENT_BUILD => '231111';
 
 # 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 233ff34321..0c12867856 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index 422a58cada..5bce0be441 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index a96b086f09..8c804251ea 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 7e78f19d4b..8642db075c 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 
 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 6aa7de6e11..a564051bcb 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 
 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 67c3bf45a4..b95a566f6a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231110"
+PI_BUILD="231111"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 79d7921e7f..b0801b9acf 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231110}
+{231111}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 35a5222e45..69b448afc3 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231110")
+#define PANDORA_VERSION ("7.0NG.774 Build 231111")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e0b8bf6b3a..5f5bf139a3 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231110))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231111))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1ebf70a92a..1bb47bf974 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231110
+Version: 7.0NG.774-231111
 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 3f2767142b..96f921a016 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231110"
+pandora_version="7.0NG.774-231111"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d76b22cdc0..21d82e414b 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 = 'PC231110';
+$build_version = 'PC231111';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c491a87f14..cb92694a1e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231110';
+            $build = '231111';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 32626c0010..3e5a7aee56 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 
 # 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 962d15e87a..ef76339911 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 
 # 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 fb91735be3..e03425ab17 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 7939f14b67..7459208acf 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231110
+Version: 7.0NG.774-231111
 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 6e93256111..294075c117 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231110"
+pandora_version="7.0NG.774-231111"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ab7c609eb8..39ef05911e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231110";
+my $pandora_build = "231111";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index f89c94d529..b04449f5c4 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231110";
+my $pandora_build = "231111";
 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 defc3395a9..d68987d805 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 89ee72bad1..9e35d46b89 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231110
+%define release     231111
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index bac143e029..b5dd72c9cc 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231110"
+PI_BUILD="231111"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 92cb8a3d32..a06e04560d 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231110";
+my $version = "7.0NG.774 Build 231111";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2822f5cb74..ab3b5e1170 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231110";
+my $version = "7.0NG.774 Build 231111";
 
 # save program name for logging
 my $progname = basename($0);

From 48352312868c7860fc790f76fd931b582cddbd90 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 12 Nov 2023 01:00:17 +0100
Subject: [PATCH 39/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 83ce6935ff..16bffd6ee2 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231111
+Version: 7.0NG.774-231112
 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 731c8e8f2d..90bb008fd6 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231111"
+pandora_version="7.0NG.774-231112"
 
 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 d376156484..4f9c2c2f53 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231111';
+use constant AGENT_BUILD => '231112';
 
 # 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 0c12867856..e13cae5fca 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index 5bce0be441..33f53e9fff 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index 8c804251ea..9b20690f92 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 8642db075c..2fb888dec0 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 
 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 a564051bcb..5061ffaccd 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 
 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 b95a566f6a..d1ce3b8e71 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231111"
+PI_BUILD="231112"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b0801b9acf..3a119d8741 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231111}
+{231112}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 69b448afc3..b65ca885ae 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231111")
+#define PANDORA_VERSION ("7.0NG.774 Build 231112")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5f5bf139a3..511cdbae37 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231111))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231112))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1bb47bf974..63c8e3ee03 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231111
+Version: 7.0NG.774-231112
 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 96f921a016..ec081017e1 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231111"
+pandora_version="7.0NG.774-231112"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 21d82e414b..4449ddcbe8 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 = 'PC231111';
+$build_version = 'PC231112';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index cb92694a1e..704280f627 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231111';
+            $build = '231112';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 3e5a7aee56..74eb10ca16 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 
 # 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 ef76339911..61f65b7020 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 
 # 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 e03425ab17..2400b9ff20 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 7459208acf..e9e4a15251 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231111
+Version: 7.0NG.774-231112
 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 294075c117..5d63092f58 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231111"
+pandora_version="7.0NG.774-231112"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 39ef05911e..402d2e95c6 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231111";
+my $pandora_build = "231112";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index b04449f5c4..9b432e5c93 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231111";
+my $pandora_build = "231112";
 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 d68987d805..31aff3ec79 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 9e35d46b89..26cb7bcc9d 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231111
+%define release     231112
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index b5dd72c9cc..30e1fb3ea7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231111"
+PI_BUILD="231112"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index a06e04560d..221b7ca744 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231111";
+my $version = "7.0NG.774 Build 231112";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ab3b5e1170..0c995149bb 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231111";
+my $version = "7.0NG.774 Build 231112";
 
 # save program name for logging
 my $progname = basename($0);

From 257a45d178ff8c3bd3dbff4e3c98248141f06c03 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 13 Nov 2023 01:00:17 +0100
Subject: [PATCH 40/41] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 16bffd6ee2..226210f313 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.774-231112
+Version: 7.0NG.774-231113
 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 90bb008fd6..8b26c19cb4 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231112"
+pandora_version="7.0NG.774-231113"
 
 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 4f9c2c2f53..073cda1757 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.774';
-use constant AGENT_BUILD => '231112';
+use constant AGENT_BUILD => '231113';
 
 # 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 e13cae5fca..dfe033d029 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index 33f53e9fff..a2ba6a612f 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index 9b20690f92..d4514f7c24 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 2fb888dec0..9384c11227 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 
 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 5061ffaccd..dd8cf57dd4 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 
 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 d1ce3b8e71..7fa270040f 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231112"
+PI_BUILD="231113"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3a119d8741..fb8c8eb2e7 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{231112}
+{231113}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index b65ca885ae..52da00f968 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.774 Build 231112")
+#define PANDORA_VERSION ("7.0NG.774 Build 231113")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 511cdbae37..4b26a0f815 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.774(Build 231112))"
+      VALUE "ProductVersion", "(7.0NG.774(Build 231113))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 63c8e3ee03..a3f08ca5ae 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.774-231112
+Version: 7.0NG.774-231113
 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 ec081017e1..0b73a70d4d 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231112"
+pandora_version="7.0NG.774-231113"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 4449ddcbe8..9abbbf3736 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 = 'PC231112';
+$build_version = 'PC231113';
 $pandora_version = 'v7.0NG.774';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 704280f627..8e74a4b822 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.774';
-            $build = '231112';
+            $build = '231113';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 74eb10ca16..f1bb1b7569 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 
 # 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 61f65b7020..5fd30276d5 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 
 # 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 2400b9ff20..001c47dcd6 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index e9e4a15251..6aed0edf9b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.774-231112
+Version: 7.0NG.774-231113
 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 5d63092f58..cc762ca821 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.774-231112"
+pandora_version="7.0NG.774-231113"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 402d2e95c6..375b6c4067 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231112";
+my $pandora_build = "231113";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 9b432e5c93..97431fe33a 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.774";
-my $pandora_build = "231112";
+my $pandora_build = "231113";
 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 31aff3ec79..0db79eb399 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 26cb7bcc9d..8cac550c44 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.774
-%define release     231112
+%define release     231113
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 30e1fb3ea7..15719565cd 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.774"
-PI_BUILD="231112"
+PI_BUILD="231113"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 221b7ca744..92c6c5f9ce 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231112";
+my $version = "7.0NG.774 Build 231113";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0c995149bb..4de7f94773 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.774 Build 231112";
+my $version = "7.0NG.774 Build 231113";
 
 # save program name for logging
 my $progname = basename($0);

From 2923de88725fffa97b3386c3ccebd4c0edf83d4b Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 13 Nov 2023 14:57:11 +0100
Subject: [PATCH 41/41] #11126-2 fixed mr

---
 pandora_console/extras/mr/66.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/extras/mr/66.sql b/pandora_console/extras/mr/66.sql
index 95fb6074ad..3af078b4fd 100644
--- a/pandora_console/extras/mr/66.sql
+++ b/pandora_console/extras/mr/66.sql
@@ -315,7 +315,7 @@ ALTER TABLE `treport_content`  ADD COLUMN `status_of_check` TINYTEXT;
 
 ALTER TABLE `tservice` ADD COLUMN `enable_horizontal_tree` TINYINT NOT NULL DEFAULT 0;
 
-INSERT IGNORE INTO `tmodule_inventory` (`id_module_inventory`, `id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`) VALUES (43,1,'Vulnerabilities','Plugin&#x20;for&#x20;security&#x20;scan','','Package;Version;CVE','',0,2);
+INSERT IGNORE INTO `tmodule_inventory` (`id_os`, `name`, `description`, `interpreter`, `data_format`, `code`, `block_mode`,`script_mode`) VALUES (1,'Vulnerabilities','Plugin&#x20;for&#x20;security&#x20;scan','','Package;Version;CVE','',0,2);
 
 ALTER TABLE `tagente` ADD COLUMN `vul_scan_enabled` TINYINT NOT NULL DEFAULT 2;