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

2011-07-27 Ramon Novoa <rnovoa@artica.es> 

* 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
This commit is contained in:
ramonn 2011-07-27 16:07:12 +00:00
parent 2dd2b640ed
commit 243975ea2a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2011-07-27 Ramon Novoa <rnovoa@artica.es>
* 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 <sergio.martin@artica.es>
* util/recon_scripts/snmpdevices.pl: Fixed undeclared variable

5
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -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);
}

2
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -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');
##########################################################################