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

2012-10-29 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/NetworkServer.pm,
	  lib/PandoraFMS/Tools.pm: Added support for custom timeouts and retries
	  to remote modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7109 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-10-29 18:42:39 +00:00
parent 6d33bd3d52
commit 7a85fd1b8a
3 changed files with 69 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2012-10-29 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/NetworkServer.pm,
lib/PandoraFMS/Tools.pm: Added support for custom timeouts and retries
to remote modules.
2012-10-24 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf,

44
pandora_server/lib/PandoraFMS/NetworkServer.pm
View File

@ -146,7 +146,7 @@ sub data_consumer ($$) {
# tcp_rcv, id_tipo_module, dbh)
# Makes a call to TCP modules to get a value.
##########################################################################
sub pandora_query_tcp ($$$$$$$$) {
sub pandora_query_tcp ($$$$$$$$$$) {
my $pa_config = $_[0];
my $tcp_port = $_[1];
my $ip_target = $_[2];
@ -155,18 +155,28 @@ sub pandora_query_tcp ($$$$$$$$) {
my $tcp_send = $_[5];
my $tcp_rcv = $_[6];
my $id_tipo_modulo = $_[7];
my $timeout = $_[8];
my $retries = $_[9];
# Adjust timeout and retry values
if ($timeout == 0) {
$timeout = $pa_config->{'tcp_timeout'};
}
if ($retries == 0) {
$retries = $pa_config->{'tcp_checks'};
}
$tcp_send = decode_entities($tcp_send);
$tcp_rcv = decode_entities($tcp_rcv);
my $counter;
for ($counter =0; $counter < $pa_config->{'tcp_checks'}; $counter++){
for ($counter =0; $counter < $retries; $counter++){
my $temp; my $temp2;
my $tam;
my $handle=IO::Socket::INET6->new(
Proto=>"tcp",
PeerAddr=>$ip_target,
Timeout=>$pa_config->{'tcp_timeout'},
Timeout=>$timeout,
PeerPort=>$tcp_port,
Multihomed=>1,
Blocking=>0 ); # Non blocking !!, very important !
@ -191,7 +201,7 @@ next_pair:
if ((defined ($tcp_rcv)) && (($tcp_rcv ne "") || ($id_tipo_modulo == 10) || ($id_tipo_modulo ==8) || ($id_tipo_modulo == 11))) {
# Receive data, non-blocking !!!! (VERY IMPORTANT!)
$temp2 = "";
for ($tam=0; $tam<($pa_config->{'tcp_timeout'}); $tam++){
for ($tam=0; $tam<$timeout; $tam++){
$handle->recv($temp,16000,0x40);
$temp2 = $temp2.$temp;
if ($temp ne ""){
@ -206,11 +216,11 @@ next_pair:
}
$$module_data = 1;
$$module_result = 0;
$counter = $pa_config->{'tcp_checks'};
$counter = $retries;
} else {
$$module_data = 0;
$$module_result = 0;
$counter = $pa_config->{'tcp_checks'};
$counter = $retries;
}
} elsif ($id_tipo_modulo == 10 ){ # TCP String (no int conversion)!
$$module_data = $temp2;
@ -220,23 +230,23 @@ next_pair:
if ($temp2 =~ /[A-Za-z\.\,\-\/\\\(\)\[\]]/){
$$module_result = 1;
$$module_data = 0; # invalid data
$counter = $pa_config->{'tcp_checks'};
$counter = $retries;
} else {
$$module_data = int($temp2);
$$module_result = 0; # Successful
$counter = $pa_config->{'tcp_checks'};
$counter = $retries;
}
} else {
$$module_result = 1;
$$module_data = 0; # invalid data
$counter = $pa_config->{'tcp_checks'};
$counter = $retries;
}
}
} else { # No expected data to receive, if connected and tcp_proc type successful
if ($id_tipo_modulo == 9){ # TCP Proc
$$module_result = 0;
$$module_data = 1;
$counter = $pa_config->{'tcp_checks'};
$counter = $retries;
}
}
$handle->close();
@ -246,7 +256,7 @@ next_pair:
if ($id_tipo_modulo == 9){ # TCP Proc
$$module_result = 0;
$$module_data = 0; # Failed, but data exists
$counter = $pa_config->{'tcp_checks'};
$counter = $retries;
}
}
}
@ -324,8 +334,8 @@ sub pandora_query_snmp ($$$) {
return (undef, 1) unless ($snmp_oid ne '');
}
my $snmp_timeout = $pa_config->{"snmp_timeout"};
my $snmp_retries = $pa_config->{'snmp_checks'};
my $snmp_timeout = $module->{"max_timeout"} != 0 ? $module->{"max_timeout"} : $pa_config->{"snmp_timeout"};
my $snmp_retries = $module->{"max_retries"} != 0 ? $module->{"max_retries"} : $pa_config->{'snmp_checks'};
my $module_result = 1; # by default error
my $module_data = 0;
@ -409,6 +419,8 @@ sub exec_network_module ($$$$) {
my $tcp_port = $module->{'tcp_port'};
my $tcp_send = $module->{'tcp_send'};
my $tcp_rcv = $module->{'tcp_rcv'};
my $timeout = $module->{'max_timeout'};
my $retries = $module->{'max_retries'};
if ((defined($ip_target)) && ($ip_target)) {
@ -417,11 +429,11 @@ sub exec_network_module ($$$$) {
# -------------------------------------------------------
if ($id_tipo_modulo == 6){ # ICMP (Connectivity only: Boolean)
$module_data = pandora_ping ($pa_config, $ip_target);
$module_data = pandora_ping ($pa_config, $ip_target, $timeout, $retries);
$module_result = 0; # Successful
}
elsif ($id_tipo_modulo == 7){ # ICMP (data for latency in ms)
$module_data = pandora_ping_latency ($pa_config, $ip_target);
$module_data = pandora_ping_latency ($pa_config, $ip_target, $timeout, $retries);
$module_result = 0; # Successful
}
@ -472,7 +484,7 @@ sub exec_network_module ($$$$) {
($id_tipo_modulo == 10) ||
($id_tipo_modulo == 11)) { # TCP Module
if ((defined($tcp_port)) && ($tcp_port < 65536) && ($tcp_port > 0)) { # Port check
pandora_query_tcp ($pa_config, $tcp_port, $ip_target, \$module_result, \$module_data, $tcp_send, $tcp_rcv, $id_tipo_modulo);
pandora_query_tcp ($pa_config, $tcp_port, $ip_target, \$module_result, \$module_data, $tcp_send, $tcp_rcv, $id_tipo_modulo, $timeout, $retries);
} else {
# Invalid port, get no check
$module_result = 1;

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

@ -800,8 +800,16 @@ Returns:
=cut
##############################################################################
sub pandora_ping ($$) {
my ($pa_config, $host) = @_;
sub pandora_ping ($$$$) {
my ($pa_config, $host, $timeout, $retries) = @_;
# Adjust timeout and retry values
if ($timeout == 0) {
$timeout = $pa_config->{'networktimeout'};
}
if ($retries == 0) {
$retries = $pa_config->{'icmp_checks'};
}
my $output = 0;
my $i;
@ -811,8 +819,8 @@ sub pandora_ping ($$) {
# Windows XP .. Windows 7
if (($OSNAME eq "MSWin32") || ($OSNAME eq "MSWin32-x64") || ($OSNAME eq "cygwin")){
my $ms_timeout = $pa_config->{'networktimeout'} * 1000;
$output = `ping -n $pa_config->{'icmp_checks'} -w $ms_timeout $host`;
my $ms_timeout = $timeout * 1000;
$output = `ping -n $retries -w $ms_timeout $host`;
if ($output =~ /TTL/){
return 1;
}
@ -830,7 +838,7 @@ sub pandora_ping ($$) {
# 'networktimeout' is not used by ping on Solaris.
# Ping the host
`$ping_command -s -n $host 56 $pa_config->{'icmp_checks'} >/dev/null 2>&1`;
`$ping_command -s -n $host 56 $retries >/dev/null 2>&1`;
if ($? == 0) {
return 1;
}
@ -838,7 +846,7 @@ sub pandora_ping ($$) {
}
elsif ($OSNAME eq "freebsd"){
my $ping_command = "ping -t $pa_config->{'networktimeout'}";
my $ping_command = "ping -t $timeout";
if ($host =~ /\d+:|:\d+/ ) {
$ping_command = "ping6";
@ -848,7 +856,7 @@ sub pandora_ping ($$) {
# 'networktimeout' is not used by ping6 on FreeBSD.
# Ping the host
`$ping_command -q -n -c $pa_config->{'icmp_checks'} $host >/dev/null 2>&1`;
`$ping_command -q -n -c $retries $host >/dev/null 2>&1`;
if ($? == 0) {
return 1;
}
@ -865,7 +873,7 @@ sub pandora_ping ($$) {
}
# Ping the host
`$ping_command -q -W $pa_config->{'networktimeout'} -n -c $pa_config->{'icmp_checks'} $host >/dev/null 2>&1`;
`$ping_command -q -W $timeout -n -c $retries $host >/dev/null 2>&1`;
if ($? == 0) {
return 1;
}
@ -882,8 +890,16 @@ Ping the given host. Returns the average round-trip time.
=cut
########################################################################
sub pandora_ping_latency ($$) {
my ($pa_config, $host) = @_;
sub pandora_ping_latency ($$$$) {
my ($pa_config, $host, $timeout, $retries) = @_;
# Adjust timeout and retry values
if ($timeout == 0) {
$timeout = $pa_config->{'networktimeout'};
}
if ($retries == 0) {
$retries = $pa_config->{'icmp_checks'};
}
my $output = 0;
@ -900,8 +916,8 @@ sub pandora_ping_latency ($$) {
# If this fails, ping can be replaced by fping which also have the same format
# but always in english
my $ms_timeout = $pa_config->{'networktimeout'} * 1000;
$output = `ping -n $pa_config->{'icmp_checks'} -w $ms_timeout $host`;
my $ms_timeout = $timeout * 1000;
$output = `ping -n $retries -w $ms_timeout $host`;
if ($output =~ m/\=\s([0-9]*)[a-z][a-z]\r/){
return $1;
@ -922,7 +938,7 @@ sub pandora_ping_latency ($$) {
# 'networktimeout' is not used by ping on Solaris.
# Ping the host
my @output = `$ping_command -s -n $host 56 $pa_config->{'icmp_checks'} 2>/dev/null`;
my @output = `$ping_command -s -n $host 56 $retries 2>/dev/null`;
# Something went wrong
return 0 if ($? != 0);
@ -934,7 +950,7 @@ sub pandora_ping_latency ($$) {
}
elsif ($OSNAME eq "freebsd"){
my $ping_command = "ping";
my $ping_command = "ping -t $timeout";
if ($host =~ /\d+:|:\d+/ ) {
$ping_command = "ping6";
@ -946,7 +962,7 @@ sub pandora_ping_latency ($$) {
# 'networktimeout' is not used on FreeBSD.
# Ping the host
my @output = `$ping_command -q -n -c $pa_config->{'icmp_checks'} $host 2>/dev/null`;
my @output = `$ping_command -q -n -c $retries $host 2>/dev/null`;
# Something went wrong
return 0 if ($? != 0);
@ -967,7 +983,7 @@ sub pandora_ping_latency ($$) {
# Ping the host
my @output = `$ping_command -q -W $pa_config->{'networktimeout'} -n -c $pa_config->{'icmp_checks'} $host 2>/dev/null`;
my @output = `$ping_command -q -W $timeout -n -c $retries $host 2>/dev/null`;
# Something went wrong
return 0 if ($? != 0);