breah change: hp 3par ssh backend

This commit is contained in:
garnier-quentin 2020-02-20 14:16:12 +01:00
parent 692c49a93a
commit fe2916be10
1 changed files with 33 additions and 28 deletions

View File

@ -22,6 +22,7 @@ package storage::hp::3par::ssh::custom::custom;
use strict; use strict;
use warnings; use warnings;
use centreon::plugins::ssh;
use centreon::plugins::misc; use centreon::plugins::misc;
sub new { sub new {
@ -41,9 +42,6 @@ sub new {
if (!defined($options{noptions})) { if (!defined($options{noptions})) {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'hostname:s' => { name => 'hostname' }, 'hostname:s' => { name => 'hostname' },
'ssh-option:s@' => { name => 'ssh_option' },
'ssh-path:s' => { name => 'ssh_path' },
'ssh-command:s' => { name => 'ssh_command', default => 'ssh' },
'timeout:s' => { name => 'timeout', default => 45 }, 'timeout:s' => { name => 'timeout', default => 45 },
'command:s' => { name => 'command' }, 'command:s' => { name => 'command' },
'command-path:s' => { name => 'command_path' }, 'command-path:s' => { name => 'command_path' },
@ -54,6 +52,7 @@ sub new {
$self->{output} = $options{output}; $self->{output} = $options{output};
$self->{mode} = $options{mode}; $self->{mode} = $options{mode};
$self->{ssh} = centreon::plugins::ssh->new(%options);
return $self; return $self;
} }
@ -83,14 +82,18 @@ sub set_defaults {
sub check_options { sub check_options {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{option_results}->{remote} = 1; $self->{remote} = 1;
if (defined($self->{option_results}->{command}) && $self->{option_results}->{command} ne '') { if (defined($self->{option_results}->{command}) && $self->{option_results}->{command} ne '') {
$self->{option_results}->{remote} = undef; $self->{remote} = 0;
} elsif (!defined($self->{option_results}->{hostname}) || $self->{option_results}->{hostname} eq '') { } elsif (!defined($self->{option_results}->{hostname}) || $self->{option_results}->{hostname} eq '') {
$self->{output}->add_option_msg(short_msg => "Need to set hostname option."); $self->{output}->add_option_msg(short_msg => "Need to set hostname option.");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
if ($self->{remote} == 1) {
$self->{ssh}->check_options(option_results => $self->{option_results});
}
return 0; return 0;
} }
@ -107,16 +110,30 @@ sub execute_command {
$append = ';'; $append = ';';
} }
return centreon::plugins::misc::execute( my $content;
if ($self->{remote} == 1) {
($content) = $self->{ssh}->execute(
ssh_pipe => 1,
hostname => $self->{option_results}->{hostname},
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}
);
} else {
($content) = centreon::plugins::misc::execute(
ssh_pipe => 1, ssh_pipe => 1,
output => $self->{output}, output => $self->{output},
options => $self->{option_results}, options => { timeout => $self->{option_results}->{timeout} },
command => defined($self->{option_results}->{command}) && $self->{option_results}->{command} ne '' ? $self->{option_results}->{command} : $self->{ssh_commands}, command => $self->{option_results}->{command},
command_path => $self->{option_results}->{command_path}, 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 command_options => defined($self->{option_results}->{command_options}) && $self->{option_results}->{command_options} ne '' ? $self->{option_results}->{command_options} : undef
); );
} }
return $content;
}
1; 1;
__END__ __END__
@ -137,18 +154,6 @@ my ssh
Hostname to query. Hostname to query.
=item B<--ssh-option>
Specify multiple options like the user (example: --ssh-option='-l=centreon-engine' --ssh-option='-p=52').
=item B<--ssh-path>
Specify ssh command path (default: none)
=item B<--ssh-command>
Specify ssh command (default: 'ssh'). Useful to use 'plink'.
=item B<--timeout> =item B<--timeout>
Timeout in seconds for the command (Default: 45). Timeout in seconds for the command (Default: 45).