From 4e1ab0be42bba03f56a0861ddeeefe8f084b6d66 Mon Sep 17 00:00:00 2001
From: Enrique Martin <enrique.martin@pandorafms.com>
Date: Thu, 7 Mar 2024 15:02:48 +0100
Subject: [PATCH] Dixed discovery server agents creation
---
.../lib/PandoraFMS/DiscoveryServer.pm | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
index 972f259bb5..918d331215 100644
--- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
+++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
@@ -2326,9 +2326,9 @@ sub PandoraFMS::Recon::Base::create_agents($$) {
);
my $parent_id;
- if (defined($agent->{'id_parent'})) {
- $parent_id = $agent->{'id_parent'};
- } elsif (defined($agent->{'parent_agent_name'})) {
+ if (defined($agent->{'id_parent'})) {
+ $parent_id = $agent->{'id_parent'};
+ } elsif (defined($agent->{'parent_agent_name'})) {
$parent_id = PandoraFMS::Core::locate_agent(
$pa_config, $dbh, $agent->{'parent_agent_name'}
);
@@ -2350,7 +2350,10 @@ sub PandoraFMS::Recon::Base::create_agents($$) {
$pa_config, $pa_config->{'servername'}, $agent->{'agent_name'},
$agent->{'address'}, $agent->{'id_group'}, $parent_id,
$os_id, $agent->{'description'},
- $agent->{'interval'}, $dbh, $agent->{'timezone_offset'}
+ $agent->{'interval'}, $dbh, $agent->{'timezone_offset'},
+ $agent->{'longitude'}, $agent->{'latitude'}, $agent->{'altitude'},
+ $agent->{'position_description'}, $agent->{'custom_id'}, $agent->{'url_address'},
+ $agent->{'agent_mode'}, $agent->{'agent_alias'}
);
$current_agent = $parent_id = PandoraFMS::Core::locate_agent(
@@ -2405,13 +2408,13 @@ sub PandoraFMS::Recon::Base::create_agents($$) {
# Add inventory data.
if (ref($inventory) eq "HASH") {
PandoraFMS::Core::process_inventory_data (
- $pa_config,
- $inventory,
- 0, # Does not seem to be used.
- $agent->{'agent_name'},
- $agent->{'interval'},
- strftime ("%Y/%m/%d %H:%M:%S", localtime()),
- $dbh
+ $pa_config,
+ $inventory,
+ 0, # Does not seem to be used.
+ $agent->{'agent_name'},
+ $agent->{'interval'},
+ strftime ("%Y/%m/%d %H:%M:%S", localtime()),
+ $dbh
);
}
}