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 ansible cli plugin

This commit is contained in:
Colin Gagnaire 2019-06-05 11:15:45 +02:00
parent cb9a0d4e24
commit 96ad0ada7b
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/automation/ansible/cli/custom/cli.pm
View File

@ -22,7 +22,6 @@ package apps::automation::ansible::cli::custom::cli;
use strict; use strict;
use warnings; use warnings;
use DateTime;
use JSON::XS; use JSON::XS;
sub new { sub new {
@ -51,7 +50,6 @@ sub new {
"command:s" => { name => 'command', default => 'ANSIBLE_LOAD_CALLBACK_PLUGINS=true ANSIBLE_STDOUT_CALLBACK=json ansible' }, "command:s" => { name => 'command', default => 'ANSIBLE_LOAD_CALLBACK_PLUGINS=true ANSIBLE_STDOUT_CALLBACK=json ansible' },
"command-path:s" => { name => 'command_path' }, "command-path:s" => { name => 'command_path' },
"command-options:s" => { name => 'command_options', default => '' }, "command-options:s" => { name => 'command_options', default => '' },
"proxyurl:s" => { name => 'proxyurl' },
}); });
} }
$options{options}->add_help(package => __PACKAGE__, sections => 'CLI OPTIONS', once => 1); $options{options}->add_help(package => __PACKAGE__, sections => 'CLI OPTIONS', once => 1);
@ -87,11 +85,6 @@ sub set_defaults {
sub check_options { sub check_options {
my ($self, %options) = @_; my ($self, %options) = @_;
if (defined($self->{option_results}->{proxyurl}) && $self->{option_results}->{proxyurl} ne '') {
$ENV{HTTP_PROXY} = $self->{option_results}->{proxyurl};
$ENV{HTTPS_PROXY} = $self->{option_results}->{proxyurl};
}
return 0; return 0;
} }
@ -106,7 +99,8 @@ sub execute {
sudo => $self->{option_results}->{sudo}, sudo => $self->{option_results}->{sudo},
command => $self->{option_results}->{command}, command => $self->{option_results}->{command},
command_path => $self->{option_results}->{command_path}, command_path => $self->{option_results}->{command_path},
command_options => $options{cmd_options}); command_options => $options{cmd_options}
);
my $raw_results; my $raw_results;
@ -122,7 +116,7 @@ sub execute {
return $raw_results; return $raw_results;
} }
sub ansible_list_host_set_cmd { sub ansible_list_hosts_set_cmd {
my ($self, %options) = @_; my ($self, %options) = @_;
return if (defined($self->{option_results}->{command_options}) && $self->{option_results}->{command_options} ne ''); return if (defined($self->{option_results}->{command_options}) && $self->{option_results}->{command_options} ne '');
@ -132,10 +126,10 @@ sub ansible_list_host_set_cmd {
return $cmd_options; return $cmd_options;
} }
sub ansible_list_host { sub ansible_list_hosts {
my ($self, %options) = @_; my ($self, %options) = @_;
my $cmd_options = $self->ansible_list_host_set_cmd(%options); my $cmd_options = $self->ansible_list_hosts_set_cmd(%options);
my $raw_results = $self->execute(cmd_options => $cmd_options); my $raw_results = $self->execute(cmd_options => $cmd_options);
return $raw_results; return $raw_results;
@ -165,7 +159,7 @@ Use 'sudo' to execute the command.
=item B<--command> =item B<--command>
Command to get information (Default: 'ansible'). Command to get information (Default: 'ANSIBLE_LOAD_CALLBACK_PLUGINS=true ANSIBLE_STDOUT_CALLBACK=json ansible').
Can be changed if you have output in a file. Can be changed if you have output in a file.
=item B<--command-path> =item B<--command-path>
@ -176,10 +170,6 @@ Command path (Default: none).
Command options (Default: none). Command options (Default: none).
=item B<--proxyurl>
Proxy URL if any
=back =back
=head1 DESCRIPTION =head1 DESCRIPTION

10
apps/automation/ansible/cli/mode/discovery.pm
View File

@ -53,7 +53,7 @@ sub run {
$disco_stats->{start_time} = time(); $disco_stats->{start_time} = time();
my $result = $options{custom}->ansible_list_host(host_pattern => $self->{option_results}->{host_pattern}); my $result = $options{custom}->ansible_list_hosts(host_pattern => $self->{option_results}->{host_pattern});
$disco_stats->{end_time} = time(); $disco_stats->{end_time} = time();
$disco_stats->{duration} = $disco_stats->{end_time} - $disco_stats->{start_time}; $disco_stats->{duration} = $disco_stats->{end_time} - $disco_stats->{start_time};
@ -103,6 +103,14 @@ Resources discovery.
=over 8 =over 8
=item B<--host-pattern>
Specify host pattern to look for (Default: 'all').
=item B<--prettify>
Prettify JSON output.
=back =back
=cut =cut