tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-10369-15058-metaconsola-con-encrypt_db-no-conecta-a-nodos-correlacion' into 'develop' 

Fix correlation server connection with nodes with encrypt enabled

See merge request artica/pandorafms!5785
This commit is contained in:
Diego Muñoz-Reja 2023-05-05 13:05:01 +00:00
parent ebd5f6c01f b4adb079a9
commit 13b4cdd176
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -978,6 +978,12 @@ sub get_db_nodes ($$) {
# Look for additional nodes. # Look for additional nodes.
my @nodes = get_db_rows($dbh, 'SELECT * FROM tmetaconsole_setup WHERE disabled = 0'); my @nodes = get_db_rows($dbh, 'SELECT * FROM tmetaconsole_setup WHERE disabled = 0');
foreach my $node (@nodes) { foreach my $node (@nodes) {
# Check and decrypy passwords if necessary.
if (defined($pa_config->{'encryption_passphrase'})) {
$pa_config->{'encryption_key'} = enterprise_hook('pandora_get_encryption_key', [$pa_config, $pa_config->{'encryption_passphrase'}]);
$node->{'dbpass'} = PandoraFMS::Core::pandora_output_password($pa_config, $node->{'dbpass'});
}
push(@{$dbh_nodes}, push(@{$dbh_nodes},
{'dbengine' => $pa_config->{'dbengine'}, {'dbengine' => $pa_config->{'dbengine'},
'dbname' => $node->{'dbname'}, 'dbname' => $node->{'dbname'},
@ -1014,8 +1020,8 @@ sub get_db_rows ($$;@) {
########################################################################## ##########################################################################
## Connect to the given node and run get_db_rows. ## Connect to the given node and run get_db_rows.
########################################################################## ##########################################################################
sub get_db_rows_node ($$;@) { sub get_db_rows_node ($$$;@) {
my ($node, $query, @values) = @_; my ($pa_config, $node, $query, @values) = @_;
my $dbh; my $dbh;
my @rows; my @rows;
@ -1028,6 +1034,22 @@ sub get_db_rows_node ($$;@) {
$node->{'dbpass'}); $node->{'dbpass'});
@rows = get_db_rows($dbh, $query, @values); @rows = get_db_rows($dbh, $query, @values);
}; };
if($@) {
# Reconnect to meta db.
my $dbh = db_connect ($pa_config->{'dbengine'},
$pa_config->{'dbname'},
$pa_config->{'dbhost'},
$pa_config->{'dbport'},
$pa_config->{'dbuser'},
$pa_config->{'dbpass'});
my $msg = "Cannot connect to node database: ".$node->{'dbhost'}.". Please check node credentials.";
logger ($pa_config, "[ERROR] ".$msg, 3);
PandoraFMS::Core::pandora_event ($pa_config, $msg, 0, 0, 4, 0, 0, 'error', 0, $dbh);
db_disconnect($dbh) if defined($dbh);
exit 0;
}
db_disconnect($dbh) if defined($dbh); db_disconnect($dbh) if defined($dbh);
@ -1037,8 +1059,8 @@ sub get_db_rows_node ($$;@) {
########################################################################## ##########################################################################
## Run get_db_rows on all known Pandora FMS nodes in parallel. ## Run get_db_rows on all known Pandora FMS nodes in parallel.
########################################################################## ##########################################################################
sub get_db_rows_parallel ($$;@) { sub get_db_rows_parallel ($$$;@) {
my ($nodes, $query, @values) = @_; my ($pa_config, $nodes, $query, @values) = @_;
# Launch the queries. # Launch the queries.
my @threads; my @threads;
@ -1051,7 +1073,7 @@ sub get_db_rows_parallel ($$;@) {
# Query the nodes. # Query the nodes.
foreach my $node (@{$nodes}) { foreach my $node (@{$nodes}) {
my $thr = threads->create(\&get_db_rows_node, $node, $query, @values); my $thr = threads->create(\&get_db_rows_node, $pa_config, $node, $query, @values);
push(@threads, $thr) if defined($thr); push(@threads, $thr) if defined($thr);
} }
} }