';
@@ -58,9 +66,11 @@ if ($files !== false) {
}
}
-if ($files64 !== false) {
- foreach ($files64 as $key => $file) {
- $output .= '
';
+if (isset($files64) === true) {
+ if ($files64 !== false) {
+ foreach ($files64 as $key => $file) {
+ $output .= '
';
+ }
}
}
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index a9ee10dc18..f9be42317e 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.775-240221
+Version: 7.0NG.775-240227
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 b393f9f116..f16c410ee6 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.775-240221"
+pandora_version="7.0NG.775-240227"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index f6a4170360..6853324266 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.775";
-my $pandora_build = "240221";
+my $pandora_build = "240227";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 8a72ef7605..cb2c5afc4c 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -407,19 +407,7 @@ sub process_xml_data ($$$$$) {
# Modify the timestamp with the timezone_offset
logger($pa_config, "Applied a timezone offset of $timestamp to agent " . $data->{'agent_name'}, 10);
-
- # Calculate the start date to add the offset
- my $utimestamp = 0;
- eval {
- if ($timestamp =~ /(\d+)[\/|\-](\d+)[\/|\-](\d+) +(\d+):(\d+):(\d+)/) {
- $utimestamp = strftime("%s", $6, $5, $4, $3, $2 -1 , $1 - 1900);
- }
- };
-
- # Apply the offset if there were no errors
- if (! $@ && $utimestamp != 0) {
- $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime($utimestamp + ($timezone_offset * 3600)));
- }
+ $timestamp = apply_timezone_offset($timestamp, $timezone_offset);
}
# Check some variables
@@ -667,6 +655,11 @@ sub process_xml_data ($$$$$) {
# Single data
if (! defined ($module_data->{'datalist'})) {
my $data_timestamp = get_tag_value ($module_data, 'timestamp', $timestamp);
+ if ($pa_config->{'use_xml_timestamp'} eq '0' && defined($timestamp)) {
+ $data_timestamp = $timestamp;
+ }
+ $data_timestamp = apply_timezone_offset($data_timestamp, $timezone_offset);
+
process_module_data ($pa_config, $module_data, $server_id, $agent, $module_name, $module_type, $interval, $data_timestamp, $dbh, $new_agent);
next;
}
@@ -684,10 +677,10 @@ sub process_xml_data ($$$$$) {
$module_data->{'data'} = $data->{'value'};
my $data_timestamp = get_tag_value ($data, 'timestamp', $timestamp);
-
if ($pa_config->{'use_xml_timestamp'} eq '0' && defined($timestamp)) {
$data_timestamp = $timestamp;
}
+ $data_timestamp = apply_timezone_offset($data_timestamp, $timezone_offset);
process_module_data ($pa_config, $module_data, $server_id, $agent, $module_name,
$module_type, $interval, $data_timestamp, $dbh, $new_agent);
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 8856a7f915..a621790a38 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.775";
-my $pandora_build = "240221";
+my $pandora_build = "240227";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 37d9ece692..1c8bd087c2 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -182,6 +182,7 @@ our @EXPORT = qw(
check_cron_element
cron_check
p_pretty_json
+ apply_timezone_offset
);
# ID of the different servers
@@ -2995,6 +2996,33 @@ sub p_pretty_json {
return $output;
}
+
+################################################################################
+# Apply a timezone offset to the given timestamp.
+################################################################################
+sub apply_timezone_offset {
+ my ($timestamp, $timezone_offset) = @_;
+
+ # Nothing to be done.
+ return $timestamp if (!defined($timezone_offset) || $timezone_offset == 0);
+
+ # Convert the timestamp to seconds.
+ my $utimestamp = 0;
+ eval {
+ if ($timestamp =~ /(\d+)[\/|\-](\d+)[\/|\-](\d+) +(\d+):(\d+):(\d+)/) {
+ $utimestamp = strftime("%s", $6, $5, $4, $3, $2 -1 , $1 - 1900);
+ }
+ };
+
+ # Something went wrong.
+ return $timestamp if ($@);
+
+ # Apply the offset and convert back to timestamp.
+ $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime($utimestamp + ($timezone_offset * 3600)));
+
+ return $timestamp;
+}
+
1;
__END__
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index de2b710cfc..99b49a7b32 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.775
-%define release 240221
+%define release 240227
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index dba23ea4db..173fa201c2 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.775
-%define release 240221
+%define release 240227
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6973401c56..31b4517e22 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.775"
-PI_BUILD="240221"
+PI_BUILD="240227"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 9feb4d3982..b1e26bd473 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.775 Build 240221";
+my $version = "7.0NG.775 Build 240227";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_ha.pl b/pandora_server/util/pandora_ha.pl
index 3bc15d6a55..28ae0df795 100755
--- a/pandora_server/util/pandora_ha.pl
+++ b/pandora_server/util/pandora_ha.pl
@@ -442,16 +442,6 @@ sub ha_database_connect_pandora($) {
# Select a new master database.
my ($dbh, $utimestamp, $max_utimestamp) = (undef, undef, -1);
- my @disabled_nodes = get_disabled_nodes($conf);
-
- # If there are disabled nodes ignore them from the HA_DB_Hosts.
- if(scalar @disabled_nodes ne 0){
- @HA_DB_Hosts = grep { my $item = $_; !grep { $_ eq $item } @disabled_nodes } @HA_DB_Hosts;
-
- my $data = join(",", @disabled_nodes);
- log_message($conf, 'LOG', "Ignoring disabled hosts: " . $data);
- }
-
foreach my $ha_dbhost (@HA_DB_Hosts) {
# Retry each database ha_connect_retries times.
@@ -478,6 +468,13 @@ sub ha_database_connect_pandora($) {
# No luck. Try the next database.
next unless defined($dbh);
+ # Check if database is disabled.
+ if (defined(get_db_value($dbh, 'SELECT `id` FROM `tdatabase` WHERE `host` = "' . $ha_dbhost . '" AND disabled = 1')))
+ {
+ log_message($conf, 'LOG', "Ignoring disabled host: " . $ha_dbhost);
+ db_disconnect($dbh);
+ next;
+ }
eval {
# Get the most recent utimestamp from the database.
$utimestamp = get_db_value($dbh, 'SELECT UNIX_TIMESTAMP(MAX(keepalive)) FROM tserver');
@@ -542,36 +539,6 @@ sub ha_restart_pandora($) {
`$config->{'pandora_service_cmd'} $control_command 2>/dev/null`;
}
-###############################################################################
-# Get ip of the disabled nodes.
-###############################################################################
-sub get_disabled_nodes($) {
- my ($conf) = @_;
-
- my $dbh = db_connect('mysql',
- $conf->{'dbname'},
- $conf->{'dbhost'},
- $conf->{'dbport'},
- $conf->{'ha_dbuser'},
- $conf->{'ha_dbpass'});
-
- my $disabled_nodes = get_db_value($dbh, "SELECT value FROM tconfig WHERE token = 'ha_disabled_nodes'");
-
- if(!defined($disabled_nodes) || $disabled_nodes eq ""){
- $disabled_nodes = ',';
- }
-
- my @disabled_nodes = split(',', $disabled_nodes);
-
- if(scalar @disabled_nodes ne 0){
- $disabled_nodes = join(",", @disabled_nodes);
- @disabled_nodes = get_db_rows($dbh, "SELECT host FROM tdatabase WHERE id IN ($disabled_nodes)");
- @disabled_nodes = map { $_->{host} } @disabled_nodes;
- }
-
- return @disabled_nodes;
-}
-
###############################################################################
# Main (Pacemaker)
###############################################################################
@@ -743,6 +710,9 @@ sub ha_main_pandora($) {
# Execute resync actions.
enterprise_hook('pandoraha_resync_dbs', [$conf, $dbh, $DB_Host, \@HA_DB_Hosts]);
+ # Update and push HA databases info to Metaconsole or nodes.
+ enterprise_hook('pandoraha_update_and_push_databases_info', [$conf, $dbh]);
+
# Synchronize nodes.
enterprise_hook('pandoraha_sync_node', [$conf, $dbh]);
};
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 50540e43ab..3200b71f46 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.775 Build 240221";
+my $version = "7.0NG.775 Build 240227";
# save program name for logging
my $progname = basename($0);