From 73494d9f828626cb0a57fc17747faf30849e1b6c Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Fri, 30 May 2014 10:01:23 +0000
Subject: [PATCH] 2014-05-30 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm
lib/PandoraFMS/DataServer.pm: Ignore the agent group coming from the XML
if autocreate_group is set.
* util/recon_scripts/snmp-recon.pl: Changed the default value for a
router-less scan.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10045 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_server/ChangeLog | 9 +++++++++
pandora_server/lib/PandoraFMS/Config.pm | 2 +-
pandora_server/lib/PandoraFMS/DataServer.pm | 18 +++++++++++-------
.../util/recon_scripts/snmp-recon.pl | 2 +-
4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index a92e021061..de21430324 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-30 Ramon Novoa <rnovoa@artica.es>
+
+ * lib/PandoraFMS/Config.pm
+ lib/PandoraFMS/DataServer.pm: Ignore the agent group coming from the XML
+ if autocreate_group is set.
+
+ * util/recon_scripts/snmp-recon.pl: Changed the default value for a
+ router-less scan.
+
2014-05-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/ReconServer.pm: Fixed wrong order in
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index dd3f79d5d0..5e4161bb96 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -275,7 +275,7 @@ sub pandora_load_config {
# Snmpget for snmpget system command (optional)
$pa_config->{"snmpget"} = "/usr/bin/snmpget";
- $pa_config->{'autocreate_group'} = 2;
+ $pa_config->{'autocreate_group'} = -1;
$pa_config->{'autocreate'} = 1;
# max log size (bytes)
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 3fb3f8dd4c..73c24a0f06 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -296,13 +296,17 @@ sub process_xml_data ($$$$$) {
# Get OS, group and description
my $os = pandora_get_os ($dbh, $data->{'os_name'});
- my $group_id = -1;
- $group_id = get_group_id ($dbh, $data->{'group'}) if (defined ($data->{'group'}));
- if ($group_id == -1) {
- $group_id = $pa_config->{'autocreate_group'};
- if (! defined (get_group_name ($dbh, $group_id))) {
- logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token)", 3);
- return;
+ my $group_id = $pa_config->{'autocreate_group'};
+ if (! defined (get_group_name ($dbh, $group_id))) {
+ if (defined ($data->{'group'}) && $data->{'group'} ne '') {
+ $group_id = get_group_id ($dbh, $data->{'group'});
+ if (! defined (get_group_name ($dbh, $group_id))) {
+ logger($pa_config, "Group " . $data->{'group'} . " does not exist.", 3);
+ return;
+ }
+ } else {
+ logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token).", 3);
+ return;
}
}
diff --git a/pandora_server/util/recon_scripts/snmp-recon.pl b/pandora_server/util/recon_scripts/snmp-recon.pl
index 329f806678..b0e55094dc 100755
--- a/pandora_server/util/recon_scripts/snmp-recon.pl
+++ b/pandora_server/util/recon_scripts/snmp-recon.pl
@@ -877,7 +877,7 @@ update_recon_task($DBH, $TASK_ID, 15);
# Find devices.
message("[2/6] Searching for switches and end hosts...");
-if ($ROUTER ne '0.0.0.0') {
+if (defined($ROUTER) && $ROUTER ne '') {
foreach my $router (keys(%VISITED_ROUTERS)) {
arp_cache_discovery($router);
}