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

Fix #2164

This commit is contained in:
garnier-quentin 2020-09-17 16:14:06 +02:00
parent 4f25b35c7f
commit 3a0fcc929f
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hardware/server/hp/oneview/restapi/custom/api.pm
View File

@ -50,6 +50,7 @@ sub new {
'proto:s' => { name => 'proto' },
'api-username:s' => { name => 'api_username' },
'api-password:s' => { name => 'api_password' },
'api-domain:s' => { name => 'api_domain' },
'timeout:s' => { name => 'timeout', default => 30 }
});
}
@ -78,18 +79,19 @@ sub check_options {
$self->{port} = (defined($self->{option_results}->{port})) ? $self->{option_results}->{port} : 443;
$self->{proto} = (defined($self->{option_results}->{proto})) ? $self->{option_results}->{proto} : 'https';
$self->{timeout} = (defined($self->{option_results}->{timeout})) ? $self->{option_results}->{timeout} : 30;
$self->{api_username} = (defined($self->{option_results}->{api_username})) ? $self->{option_results}->{api_username} : undef;
$self->{api_password} = (defined($self->{option_results}->{api_password})) ? $self->{option_results}->{api_password} : undef;
$self->{api_username} = (defined($self->{option_results}->{api_username})) ? $self->{option_results}->{api_username} : '';
$self->{api_password} = (defined($self->{option_results}->{api_password})) ? $self->{option_results}->{api_password} : '';
$self->{api_domain} = $self->{option_results}->{api_domain};
if (!defined($self->{hostname}) || $self->{hostname} eq '') {
if ($self->{hostname} eq '') {
$self->{output}->add_option_msg(short_msg => "Need to specify --hostname option.");
$self->{output}->option_exit();
}
if (!defined($self->{api_username}) || $self->{api_username} eq '') {
if ($self->{api_username} eq '') {
$self->{output}->add_option_msg(short_msg => "Need to specify --api-username option.");
$self->{output}->option_exit();
}
if (!defined($self->{api_password}) || $self->{api_password} eq '') {
if ($self->{api_password} eq '') {
$self->{output}->add_option_msg(short_msg => "Need to specify --api-password option.");
$self->{output}->option_exit();
}
@ -168,12 +170,14 @@ sub authenticate {
if ($has_cache_file == 0 || !defined($session_id)) {
my $json_request = { userName => $self->{api_username}, password => $self->{api_password} };
$json_request->{authLoginDomain} = $self->{api_domain} if (defined($self->{api_domain}) && $self->{api_domain} ne '');
my $encoded;
eval {
$encoded = encode_json($json_request);
};
if ($@) {
$self->{output}->add_option_msg(short_msg => "Cannot encode json request");
$self->{output}->add_option_msg(short_msg => 'Cannot encode json request');
$self->{output}->option_exit();
}
@ -209,7 +213,7 @@ sub authenticate {
);
my $decoded = $self->decode_api_response(content => $content);
if (!defined($decoded->{currentVersion})) {
$self->{output}->add_option_msg(short_msg => 'annot get api version');
$self->{output}->add_option_msg(short_msg => 'Cannot get api version');
$self->{output}->option_exit();
}
$self->{http}->add_header(key => 'X-Api-Version', value => $decoded->{currentVersion});
@ -271,6 +275,10 @@ Set username.
Set password.
=item B<--api-domain>
Set domain.
=item B<--timeout>
Threshold for HTTP timeout (Default: '30').

3
hardware/server/hp/oneview/restapi/mode/components/enclosure.pm
View File

@ -34,8 +34,9 @@ sub check_subpart {
foreach (@{$options{entries}}) {
my $instance = $options{enclosure} . ':' . $_->{$options{instance}};
next if ($self->check_filter(section => 'enclosure.' . $options{section}, instance => $instance));
next if ($_->{devicePresence} =~ /absent/i);
my $status = defined($_->{status}) ? $_->{status} : 'n/a';
$self->{output}->output_add(

8
hardware/server/hp/oneview/restapi/plugin.pm
View File

@ -31,12 +31,12 @@ sub new {
bless $self, $class;
$self->{version} = '1.0';
%{$self->{modes}} = (
$self->{modes} = {
'hardware' => 'hardware::server::hp::oneview::restapi::mode::hardware',
'storage-pools' => 'hardware::server::hp::oneview::restapi::mode::storagepools',
);
'storage-pools' => 'hardware::server::hp::oneview::restapi::mode::storagepools'
};
$self->{custom_modes}{api} = 'hardware::server::hp::oneview::restapi::custom::api';
$self->{custom_modes}->{api} = 'hardware::server::hp::oneview::restapi::custom::api';
return $self;
}