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

Added support for fping. 

(cherry picked from commit 05390e7bd7)
This commit is contained in:
Ramon Novoa 2014-12-05 11:07:07 +01:00
parent c51882583e
commit c2f9df2d6c
5 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_server/FreeBSD/pandora_server.conf.new
View File

@ -247,6 +247,9 @@ xprobe2 /usr/local/bin/xprobe2
nmap /usr/local/bin/nmap nmap /usr/local/bin/nmap
# Path to the fping binary. Used by the Enterprise ICMP Server.
fping /usr/bin/fping
# A value that specifies how aggressive nmap should be from 1 to 5. 1 means slower but more reliable, 5 means faster but less reliable. 2 by default. # A value that specifies how aggressive nmap should be from 1 to 5. 1 means slower but more reliable, 5 means faster but less reliable. 2 by default.
nmap_timing_template 2 nmap_timing_template 2

3
pandora_server/NetBSD/pandora_server.conf.new
View File

@ -248,6 +248,9 @@ xprobe2 /usr/local/bin/xprobe2
nmap /usr/pkg/bin/nmap nmap /usr/pkg/bin/nmap
# Path to the fping binary. Used by the Enterprise ICMP Server.
fping /usr/bin/fping
# A value that specifies how aggressive nmap should be from 1 to 5. 1 means slower but more reliable, 5 means faster but less reliable. 2 by default. # A value that specifies how aggressive nmap should be from 1 to 5. 1 means slower but more reliable, 5 means faster but less reliable. 2 by default.
nmap_timing_template 2 nmap_timing_template 2

3
pandora_server/conf/pandora_server.conf.new
View File

@ -244,6 +244,9 @@ xprobe2 /usr/bin/xprobe2
nmap /usr/bin/nmap nmap /usr/bin/nmap
# Path to the fping binary. Used by the Enterprise ICMP Server.
fping /usr/bin/fping
# A value that specifies how aggressive nmap should be from 1 to 5. 1 means slower but more reliable, 5 means faster but less reliable. 2 by default. # A value that specifies how aggressive nmap should be from 1 to 5. 1 means slower but more reliable, 5 means faster but less reliable. 2 by default.
nmap_timing_template 2 nmap_timing_template 2

3
pandora_server/conf/pandora_server.conf.windows
View File

@ -209,6 +209,9 @@ dataserver_threads 2
#nmap c:\pandora_server\bin\nmap.exe #nmap c:\pandora_server\bin\nmap.exe
# Path to the fping binary. Used by the Enterprise ICMP Server.
#fping c:\pandora_server\bin\Fping.exe
# snmpget: Needed to do SNMP checks. # snmpget: Needed to do SNMP checks.
#snmpget c:\pandora_server\bin\snmpget.exe #snmpget c:\pandora_server\bin\snmpget.exe

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

@ -267,6 +267,8 @@ sub pandora_load_config {
$pa_config->{"nmap_timing_template"} = 2; # > 5.1 $pa_config->{"nmap_timing_template"} = 2; # > 5.1
$pa_config->{"recon_timing_template"} = 3; # > 5.1 $pa_config->{"recon_timing_template"} = 3; # > 5.1
$pa_config->{"fping"} = "/usr/bin/fping"; # > 5.1SP2
# braa for enterprise snmp server # braa for enterprise snmp server
$pa_config->{"braa"} = "/usr/bin/braa"; $pa_config->{"braa"} = "/usr/bin/braa";
@ -618,6 +620,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^nmap\s(.*)/i) { elsif ($parametro =~ m/^nmap\s(.*)/i) {
$pa_config->{'nmap'}= clean_blank($1); $pa_config->{'nmap'}= clean_blank($1);
} }
elsif ($parametro =~ m/^fping\s(.*)/i) {
$pa_config->{'fping'}= clean_blank($1);
}
elsif ($parametro =~ m/^nmap_timing_template\s([0-9]*)/i) { elsif ($parametro =~ m/^nmap_timing_template\s([0-9]*)/i) {
$pa_config->{'nmap_timing_template'}= clean_blank($1); $pa_config->{'nmap_timing_template'}= clean_blank($1);
} }