From 6cf9369cf995dd89f4551fba9818144cef324c39 Mon Sep 17 00:00:00 2001 From: garnier-quentin Date: Tue, 24 Mar 2020 09:25:13 +0100 Subject: [PATCH] fix ssh connection --- centreon-plugins/centreon/plugins/backend/ssh/plink.pm | 1 + centreon-plugins/centreon/plugins/backend/ssh/sshcli.pm | 1 + centreon-plugins/network/paloalto/ssh/custom/cli.pm | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/centreon-plugins/centreon/plugins/backend/ssh/plink.pm b/centreon-plugins/centreon/plugins/backend/ssh/plink.pm index 658be03c7..1b4f745e2 100644 --- a/centreon-plugins/centreon/plugins/backend/ssh/plink.pm +++ b/centreon-plugins/centreon/plugins/backend/ssh/plink.pm @@ -65,6 +65,7 @@ sub execute { my ($self, %options) = @_; push @{$self->{ssh_option}}, '-T' if (defined($options{ssh_pipe}) && $options{ssh_pipe} == 1); + $options{command} .= $options{cmd_exit} if (defined($options{cmd_exit}) && $options{cmd_exit} ne ''); my ($content, $exit_code) = centreon::plugins::misc::execute( output => $self->{output}, diff --git a/centreon-plugins/centreon/plugins/backend/ssh/sshcli.pm b/centreon-plugins/centreon/plugins/backend/ssh/sshcli.pm index 2b86eca38..7374b7c21 100644 --- a/centreon-plugins/centreon/plugins/backend/ssh/sshcli.pm +++ b/centreon-plugins/centreon/plugins/backend/ssh/sshcli.pm @@ -67,6 +67,7 @@ sub execute { my ($self, %options) = @_; push @{$self->{ssh_option}}, '-T' if (defined($options{ssh_pipe}) && $options{ssh_pipe} == 1); + $options{command} .= $options{cmd_exit} if (defined($options{cmd_exit}) && $options{cmd_exit} ne ''); my ($content, $exit_code) = centreon::plugins::misc::execute( output => $self->{output}, diff --git a/centreon-plugins/network/paloalto/ssh/custom/cli.pm b/centreon-plugins/network/paloalto/ssh/custom/cli.pm index 31df4996a..d3f6d83d5 100644 --- a/centreon-plugins/network/paloalto/ssh/custom/cli.pm +++ b/centreon-plugins/network/paloalto/ssh/custom/cli.pm @@ -115,7 +115,8 @@ sub execute_command { command => defined($self->{option_results}->{command}) && $self->{option_results}->{command} ne '' ? $self->{option_results}->{command} : $self->{ssh_commands}, command_path => $self->{option_results}->{command_path}, command_options => defined($self->{option_results}->{command_options}) && $self->{option_results}->{command_options} ne '' ? $self->{option_results}->{command_options} : undef, - timeout => $self->{option_results}->{timeout} + timeout => $self->{option_results}->{timeout}, + cmd_exit => !defined($self->{option_results}->{command}) || $self->{option_results}->{command} eq '' ? "exit\n" : undef ); } else { if (!defined($self->{option_results}->{command}) || $self->{option_results}->{command} eq '') {