From 243975ea2a96eaf31220797011753e9035daed80 Mon Sep 17 00:00:00 2001 From: ramonn Date: Wed, 27 Jul 2011 16:07:12 +0000 Subject: [PATCH] 2011-07-27 Ramon Novoa * lib/PandoraFMS/Config.pm: Read configuration for the new enterprise SNMP server. * lib/PandoraFMS/Core.pm: Added server type for the new enterprise SNMP server. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4637 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 8 ++++++++ pandora_server/lib/PandoraFMS/Config.pm | 5 ++++- pandora_server/lib/PandoraFMS/Core.pm | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 7ef70edbed..eb21123b98 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,11 @@ +2011-07-27 Ramon Novoa + + * lib/PandoraFMS/Config.pm: Read configuration for the new enterprise + SNMP server. + + * lib/PandoraFMS/Core.pm: Added server type for the new enterprise SNMP + server. + 2011-07-21 Sergio Martin * util/recon_scripts/snmpdevices.pl: Fixed undeclared variable diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index ebce419a16..c42b5707e4 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -256,7 +256,7 @@ sub pandora_load_config { $pa_config->{"nmap"} = "/usr/bin/nmap"; # braa for enterprise snmp server - $pa_config->{"braa"} = "/usr/bin/braa"; + $pa_config->{"braa"} = "/usr/local/bin/braa"; # Xprobe2 for recon OS fingerprinting and tcpscan (optional) $pa_config->{"xprobe2"} = "/usr/bin/xprobe2"; @@ -466,6 +466,9 @@ sub pandora_load_config { elsif ($parametro =~ m/^snmpconsole\s([0-9]*)/i) { $pa_config->{"snmpconsole"} = clean_blank($1); } + elsif ($parametro =~ m/^snmpserver\s([0-9]*)/i) { + $pa_config->{"snmpserver"} = clean_blank($1); + } elsif ($parametro =~ m/^alert_recovery\s([0-9]*)/i) { $pa_config->{"alert_recovery"} = clean_blank($1); } diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 93cf71ce23..3676fdc154 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -171,7 +171,7 @@ our @EXPORT = qw( # Some global variables our @DayNames = qw(sunday monday tuesday wednesday thursday friday saturday); -our @ServerTypes = qw (dataserver networkserver snmpconsole reconserver pluginserver predictionserver wmiserver exportserver inventoryserver webserver eventserver icmpserver); +our @ServerTypes = qw (dataserver networkserver snmpconsole reconserver pluginserver predictionserver wmiserver exportserver inventoryserver webserver eventserver icmpserver snmpserver); our @AlertStatus = ('Execute the alert', 'Do not execute the alert', 'Do not execute the alert, but increment its internal counter', 'Cease the alert', 'Recover the alert', 'Reset internal counter'); ##########################################################################