tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved to be able to define timeout for file transfer programs.

Browse Source
This commit is contained in:
Junichi Satoh 2015-05-28 15:17:39 +09:00
parent 70cc8fbc8f
commit b84b508b48
1 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
pandora_agents/unix/pandora_agent
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl #!/usr/bin/perl
# ********************************************************************** # **********************************************************************
# Pandora FMS Generic Unix/Perl Agent # Pandora FMS Generic Unix/Perl Agent
# (c) 2009-2011 Artica Soluciones Tecnológicas # (c) 2009-2015 Artica Soluciones Tecnológicas
# with the help of many people. Please see http://pandorafms.org # with the help of many people. Please see http://pandorafms.org
# This code is licensed under GPL 2.0 license. # This code is licensed under GPL 2.0 license.
# ********************************************************************** # **********************************************************************
@ -12,7 +12,7 @@ pandora_agent - Pandora FMS Agent
=head1 VERSION =head1 VERSION
Version 5.0 Version 6.0
=head1 USAGE =head1 USAGE
@ -132,6 +132,7 @@ my %DefaultConf = (
'encoding' => 'UTF-8', 'encoding' => 'UTF-8',
'server_port' => 41121, 'server_port' => 41121,
'transfer_mode' => 'tentacle', 'transfer_mode' => 'tentacle',
'transfer_timeout' => 30,
'server_user' => 'pandora', 'server_user' => 'pandora',
'server_pwd' => '', 'server_pwd' => '',
'server_ssl' => 'no', 'server_ssl' => 'no',
@ -145,6 +146,7 @@ my %DefaultConf = (
'secondary_server_path' => '/var/spool/pandora/data_in', 'secondary_server_path' => '/var/spool/pandora/data_in',
'secondary_server_port' => 41121, 'secondary_server_port' => 41121,
'secondary_transfer_mode' => 'tentacle', 'secondary_transfer_mode' => 'tentacle',
'secondary_transfer_timeout' => 30,
'secondary_server_user' => 'pandora', 'secondary_server_user' => 'pandora',
'secondary_server_pwd' => '', 'secondary_server_pwd' => '',
'secondary_server_ssl' => 'no', 'secondary_server_ssl' => 'no',
@ -814,29 +816,38 @@ sub send_file {
my ($file, $secondary) = @_; my ($file, $secondary) = @_;
my $output; my $output;
if ($Conf{'transfer_mode'} eq 'tentacle') { eval {
$output = `tentacle_client -v -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} "$file" 2>&1 >$DevNull`; local $SIG{'ALRM'} = sub {die};
} elsif ($Conf{'transfer_mode'} eq 'ssh') { alarm ($Conf{'transfer_timeout'});
$output = `scp -P $Conf{'server_port'} "$file" pandora@"$Conf{'server_ip'}:$Conf{'server_path'}" 2>&1 >$DevNull`; if ($Conf{'transfer_mode'} eq 'tentacle') {
} elsif ($Conf{'transfer_mode'} eq 'ftp') { $output = `tentacle_client -v -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} "$file" 2>&1 >$DevNull`;
my $base = basename ($file); } elsif ($Conf{'transfer_mode'} eq 'ssh') {
my $dir = dirname ($file); $output = `scp -P $Conf{'server_port'} "$file" pandora@"$Conf{'server_ip'}:$Conf{'server_path'}" 2>&1 >$DevNull`;
} elsif ($Conf{'transfer_mode'} eq 'ftp') {
my $base = basename ($file);
my $dir = dirname ($file);
$output = `ftp -n $Conf{'server_opts'} $Conf{'server_ip'} $Conf{'server_port'} 2>&1 >$DevNull <<FEOF1 $output = `ftp -n $Conf{'server_opts'} $Conf{'server_ip'} $Conf{'server_port'} 2>&1 >$DevNull <<FEOF1
quote USER $Conf{'server_user'} quote USER $Conf{'server_user'}
quote PASS $Conf{'server_pwd'} quote PASS $Conf{'server_pwd'}
lcd "$dir" lcd "$dir"
cd "$Conf{'server_path'}" cd "$Conf{'server_path'}"
put "$base" put "$base"
quit quit
FEOF1` FEOF1`
} elsif ($Conf{'transfer_mode'} eq 'local') { } elsif ($Conf{'transfer_mode'} eq 'local') {
$output = `cp "$file" "$Conf{'server_path'}/" 2>&1 >$DevNull`; $output = `cp "$file" "$Conf{'server_path'}/" 2>&1 >$DevNull`;
}
alarm (0);
};
if ($@) {
$output = "File transfer command is not responding.";
} }
# Get the errorlevel # Get the errorlevel
my $rc = $? >> 8; my $rc = $? >> 8;
if ($rc != 0) { if ($rc != 0 || $@) {
log_message ('error', "Error sending file '$file': $output"); log_message ('error', "Error sending file '$file': $output");
} }
@ -876,6 +887,7 @@ sub swap_servers () {
($Conf{'server_path'}, $Conf{'secondary_server_path'}) = ($Conf{'secondary_server_path'}, $Conf{'server_path'}); ($Conf{'server_path'}, $Conf{'secondary_server_path'}) = ($Conf{'secondary_server_path'}, $Conf{'server_path'});
($Conf{'server_port'}, $Conf{'secondary_server_port'}) = ($Conf{'secondary_server_port'}, $Conf{'server_port'}); ($Conf{'server_port'}, $Conf{'secondary_server_port'}) = ($Conf{'secondary_server_port'}, $Conf{'server_port'});
($Conf{'transfer_mode'}, $Conf{'secondary_transfer_mode'}) = ($Conf{'secondary_transfer_mode'}, $Conf{'transfer_mode'}); ($Conf{'transfer_mode'}, $Conf{'secondary_transfer_mode'}) = ($Conf{'secondary_transfer_mode'}, $Conf{'transfer_mode'});
($Conf{'transfer_timeout'}, $Conf{'secondary_transfer_timeout'}) = ($Conf{'secondary_transfer_timeout'}, $Conf{'transfer_timeout'});
($Conf{'server_user'}, $Conf{'secondary_server_user'}) = ($Conf{'secondary_server_user'}, $Conf{'server_user'}); ($Conf{'server_user'}, $Conf{'secondary_server_user'}) = ($Conf{'secondary_server_user'}, $Conf{'server_user'});
($Conf{'server_pwd'}, $Conf{'secondary_server_pwd'}) = ($Conf{'secondary_server_pwd'}, $Conf{'server_pwd'}); ($Conf{'server_pwd'}, $Conf{'secondary_server_pwd'}) = ($Conf{'secondary_server_pwd'}, $Conf{'server_pwd'});
($Conf{'server_ssl'}, $Conf{'secondary_server_ssl'}) = ($Conf{'secondary_server_ssl'}, $Conf{'server_ssl'}); ($Conf{'server_ssl'}, $Conf{'secondary_server_ssl'}) = ($Conf{'secondary_server_ssl'}, $Conf{'server_ssl'});
@ -889,29 +901,38 @@ sub recv_file ($) {
my $file = shift; my $file = shift;
my $output; my $output;
if ($Conf{'transfer_mode'} eq 'tentacle') { eval {
$output = `cd "$Conf{'temporal'}"$CmdSep tentacle_client -v -g -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} $file 2>&1 >$DevNull` local $SIG{'ALRM'} = sub {die};
} elsif ($Conf{'transfer_mode'} eq 'ssh') { alarm ($Conf{'transfer_timeout'});
$output = `scp -P $Conf{'server_port'} pandora@"$Conf{'server_ip'}:$Conf{'server_path'}/$file" $Conf{'temporal'} 2>&1 >$DevNull`; if ($Conf{'transfer_mode'} eq 'tentacle') {
} elsif ($Conf{'transfer_mode'} eq 'ftp') { $output = `cd "$Conf{'temporal'}"$CmdSep tentacle_client -v -g -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} $file 2>&1 >$DevNull`
my $base = basename ($file); } elsif ($Conf{'transfer_mode'} eq 'ssh') {
my $dir = dirname ($file); $output = `scp -P $Conf{'server_port'} pandora@"$Conf{'server_ip'}:$Conf{'server_path'}/$file" $Conf{'temporal'} 2>&1 >$DevNull`;
} elsif ($Conf{'transfer_mode'} eq 'ftp') {
my $base = basename ($file);
my $dir = dirname ($file);
$output = `ftp -n $Conf{'server_opts'} $Conf{'server_ip'} $Conf{'server_port'} 2>&1 >$DevNull <<FEOF1 $output = `ftp -n $Conf{'server_opts'} $Conf{'server_ip'} $Conf{'server_port'} 2>&1 >$DevNull <<FEOF1
quote USER $Conf{'server_user'} quote USER $Conf{'server_user'}
quote PASS $Conf{'server_pwd'} quote PASS $Conf{'server_pwd'}
lcd "$Conf{'temporal'}" lcd "$Conf{'temporal'}"
cd "$Conf{'server_path'}" cd "$Conf{'server_path'}"
get "$file" get "$file"
quit quit
FEOF1` FEOF1`
} elsif ($Conf{'transfer_mode'} eq 'local') { } elsif ($Conf{'transfer_mode'} eq 'local') {
$output = `cp $Conf{'server_path'}/$file $Conf{'temporal'} 2>&1 >$DevNull`; $output = `cp $Conf{'server_path'}/$file $Conf{'temporal'} 2>&1 >$DevNull`;
}
alarm (0);
};
if ($@) {
$output = "File transfer command is not responding.";
} }
# Get the errorlevel # Get the errorlevel
my $rc = $? >> 8; my $rc = $? >> 8;
if ($rc != 0) { if ($rc != 0 || $@) {
log_message ('error', "Error retrieving file: $output"); log_message ('error', "Error retrieving file: $output");
} }