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

2013-10-09 Junichi Satoh <junichi@rworks.jp> 

* lib/PandoraFMS/Tools.pm: Fixed ping monitoring failure on NetBSD.
	Contributed by Hiroki SHIMIZU. Thanks!



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8875 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2013-10-09 00:55:20 +00:00
parent ae405d5af7
commit d0504ce750
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-09 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Tools.pm: Fixed ping monitoring failure on NetBSD.
Contributed by Hiroki SHIMIZU. Thanks!
2013-10-08 Junichi Satoh <junichi@rworks.jp>
* pandora_server_installer: Added p5-JSON to description for FreeBSD.

46
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -702,6 +702,9 @@ sub free_mem {
$free_mem = $pages_free * $page_size / 1024;
}
elsif ($OSNAME eq "netbsd"){
$free_mem = `cat /proc/meminfo | grep MemFree | awk '{ print \$2 }'`;
}
# by default LINUX calls
else {
$free_mem = `free | grep Mem | awk '{ print \$4 }'`;
@ -808,6 +811,24 @@ sub pandora_ping ($$$$) {
}
return 0;
}
elsif ($OSNAME eq "netbsd"){
my $ping_command = "ping -w $timeout";
if ($host =~ /\d+:|:\d+/ ) {
$ping_command = "ping6";
}
# Note: timeout(-w) option is not implemented in ping6.
# 'networktimeout' is not used by ping6 on NetBSD.
# Ping the host
`$ping_command -q -n -c $retries $host >/dev/null 2>&1`;
if ($? == 0) {
return 1;
}
return 0;
}
# by default LINUX calls
else {
@ -918,6 +939,30 @@ sub pandora_ping_latency ($$$$) {
return undef unless ($stats =~ m/([\d\.]+)\/([\d\.]+)\/([\d\.]+)\/([\d\.]+) +ms/);
return $2;
}
elsif ($OSNAME eq "netbsd"){
my $ping_command = "ping -w $timeout";
if ($host =~ /\d+:|:\d+/ ) {
$ping_command = "ping6";
}
# Note: timeout(-w) option is not implemented in ping6.
# timeout(-w) and waittime(-W) options in ping are not the same as
# Linux. On latency, there are no way to set timeout.
# 'networktimeout' is not used on NetBSD.
# Ping the host
my @output = `$ping_command -q -n -c $retries $host >/dev/null 2>&1`;
# Something went wrong
return undef in ($? != 0);
# Parse the output
my $stats = pop (@output);
return undef unless ($stats =~ m/([\d\.]+)\/([\d\.]+)\/([\d\.]+)\/([\d\.]+) +ms/);
return $2;
}
# by default LINUX calls
else {
@ -1203,3 +1248,4 @@ sub valid_regex ($) {
1;
__END__