2014-05-10 Junichi Satoh <junichi@rworks.jp>

* util/recon_script/ipmi-recon.pl, util/recon_script/snmpdevices.pl,
	util/recon_script/wmi-recon.pl: Added support for FreeBSD.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9907 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-05-10 02:09:44 +00:00
parent 35477caafe
commit 70c784c5a9
4 changed files with 38 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2014-05-10 Junichi Satoh <junichi@rworks.jp>
* util/recon_script/ipmi-recon.pl, util/recon_script/snmpdevices.pl,
util/recon_script/wmi-recon.pl: Added support for FreeBSD.
2014-05-09 Ramon Novoa <rnovoa@artica.es>
* bin/tentacle_server.exe: Added to repository. Tentacle server win32

View File

@ -27,7 +27,15 @@ my $pkg_timeout = 3; #Pkg ping timeout wait
##########################################################################
# Code begins here, do not touch
##########################################################################
my $pandora_conf = "/etc/pandora/pandora_server.conf";
my $OSNAME = $^O;
my $pandora_conf;
if ($OSNAME eq "freebsd") {
$pandora_conf = "/usr/local/etc/pandora/pandora_server.conf";
} else {
$pandora_conf = "/etc/pandora/pandora_server.conf";
}
my $task_id = $ARGV[0]; # Passed automatically by the server
my $target_group = $ARGV[1]; # Defined by user
my $create_incident = $ARGV[2]; # Defined by user

View File

@ -27,7 +27,15 @@ my $target_interval = 600;
##########################################################################
# Code begins here, do not touch
##########################################################################
my $pandora_conf = "/etc/pandora/pandora_server.conf";
my $OSNAME = $^O;
my $pandora_conf;
if ($OSNAME eq "freebsd") {
$pandora_conf = "/usr/local/etc/pandora/pandora_server.conf";
} else {
$pandora_conf = "/etc/pandora/pandora_server.conf";
}
my $task_id = $ARGV[0]; # Passed automatically by the server
my $target_group = $ARGV[1]; # Defined by user
my $create_incident = $ARGV[2]; # Defined by user

View File

@ -18,7 +18,20 @@ use PandoraFMS::Config;
use PandoraFMS::NmapParser;
# Pandora FMS configuration hash.
my %CONF = ('quiet' => 0,
my $OSNAME = $^O;
my %CONF;
if ($OSNAME eq "freebsd") {
%CONF = ('quiet' => 0,
'verbosity' => 1,
'daemon' => 0,
'PID' => '',
'pandora_path' => '/usr/local/etc/pandora/pandora_server.conf',
'ping_timeout' => 2,
'ping_retries' => 1,
'wmi_client' => '/usr/local/bin/wmic');
} else {
%CONF = ('quiet' => 0,
'verbosity' => 1,
'daemon' => 0,
'PID' => '',
@ -26,6 +39,7 @@ my %CONF = ('quiet' => 0,
'ping_timeout' => 2,
'ping_retries' => 1,
'wmi_client' => '/usr/bin/wmic');
}
# If set to 1 incidents will be created in the Pandora FMS Console.
my $CREATE_INCIDENT;