+ enhance a little

This commit is contained in:
garnier-quentin 2015-09-30 13:56:12 +02:00
parent eb83c1f8db
commit 583dd086d3
4 changed files with 80 additions and 101 deletions

View File

@ -23,7 +23,6 @@ package cloud::aws::custom::awscli;
use strict; use strict;
use warnings; use warnings;
use JSON; use JSON;
use Data::Dumper;
use centreon::plugins::misc; use centreon::plugins::misc;
sub new { sub new {
@ -53,15 +52,10 @@ sub new {
"sudo" => { name => 'sudo' }, "sudo" => { name => 'sudo' },
} ); } );
} }
$options{options}->add_help( $options{options}->add_help(package => __PACKAGE__, sections => 'AWSCLI OPTIONS', once => 1);
package => __PACKAGE__,
sections => 'AWSCLI OPTIONS',
once => 1
);
$self->{output} = $options{output}; $self->{output} = $options{output};
$self->{mode} = $options{mode}; $self->{mode} = $options{mode};
return $self; return $self;
} }
@ -78,8 +72,6 @@ sub set_options {
sub set_defaults { sub set_defaults {
my ( $self, %options ) = @_; my ( $self, %options ) = @_;
# options{default}
# Manage default value # Manage default value
foreach ( keys %{ $options{default} } ) { foreach ( keys %{ $options{default} } ) {
if ( $_ eq $self->{mode} ) { if ( $_ eq $self->{mode} ) {
@ -96,30 +88,30 @@ sub set_defaults {
} }
sub check_options { sub check_options {
my ( $self, %options ) = @_; my ($self, %options) = @_;
return 0; return 0;
} }
sub execReq { sub execReq {
my ( $self, $options ) = @_; my ($self, $options) = @_;
my $jsoncontent; my $jsoncontent;
if ( !defined( $options->{output} ) ) { if (!defined($options->{output})) {
$options->{output} = 'json'; $options->{output} = 'json';
} }
my $json = JSON->new; my $json = JSON->new;
my $json_encoded = $options->{command} . " " . $options->{subcommand}; my $json_encoded = $options->{command} . " " . $options->{subcommand};
if ( defined( $self->{option_results}->{region} ) ) { if (defined($self->{option_results}->{region})) {
$json_encoded = $json_encoded . " --region '". $self->{option_results}->{region} . "'"; $json_encoded = $json_encoded . " --region '". $self->{option_results}->{region} . "'";
} }
if ( defined( $options->{json} ) ) { if (defined($options->{json})) {
$json_encoded = $json_encoded . " --cli-input-json '" . $json->encode( $options->{json} ) . "'"; $json_encoded = $json_encoded . " --cli-input-json '" . $json->encode( $options->{json} ) . "'";
} }
$self->{option_results}->{timeout} = 30; $self->{option_results}->{timeout} = 30;
if ( $options->{output} eq 'text' ) { if ($options->{output} eq 'text') {
$self->{stdout} = centreon::plugins::misc::execute( $self->{stdout} = centreon::plugins::misc::execute(
output => $self->{output}, output => $self->{output},
options => $self->{option_results}, options => $self->{option_results},
@ -130,8 +122,7 @@ sub execReq {
); );
my @return = split /\n/, $self->{stdout}; my @return = split /\n/, $self->{stdout};
$jsoncontent = $json->encode( [@return] ); $jsoncontent = $json->encode( [@return] );
} } else {
else {
$jsoncontent = centreon::plugins::misc::execute( $jsoncontent = centreon::plugins::misc::execute(
output => $self->{output}, output => $self->{output},
options => $self->{option_results}, options => $self->{option_results},
@ -141,7 +132,7 @@ sub execReq {
command_options => $json_encoded command_options => $json_encoded
); );
} }
if ( $? > 0 ) { if ($? > 0) {
$self->{output}->add_option_msg( short_msg => "Cannot run aws" ); $self->{output}->add_option_msg( short_msg => "Cannot run aws" );
$self->{output}->option_exit(); $self->{output}->option_exit();
} }

View File

@ -25,18 +25,17 @@ use base qw(centreon::plugins::mode);
use strict; use strict;
use warnings; use warnings;
use centreon::plugins::misc; use centreon::plugins::misc;
use Data::Dumper;
use POSIX; use POSIX;
use JSON; use JSON;
use Module::Load; use Module::Load;
my $CloudwatchMetrics = { my $CloudwatchMetrics = {
'cpu' => "cloud::aws::mode::metrics::ec2instancecpu", cpu => "cloud::aws::mode::metrics::ec2instancecpu",
'traffic' => "cloud::aws::mode::metrics::ec2instancenetwork", traffic' => "cloud::aws::mode::metrics::ec2instancenetwork",
'cpucreditusage' => "cloud::aws::mode::metrics::ec2instancecpucreditusage", cpucreditusage => "cloud::aws::mode::metrics::ec2instancecpucreditusage",
'cpucreditbalance' => "cloud::aws::mode::metrics::ec2instancecpucreditbalance", cpucreditbalance => "cloud::aws::mode::metrics::ec2instancecpucreditbalance",
'bucketsize' => "cloud::aws::mode::metrics::s3bucketsize", bucketsize => "cloud::aws::mode::metrics::s3bucketsize",
'rdscpu' => "cloud::aws::mode::metrics::rdsinstancecpu", rdscpu => "cloud::aws::mode::metrics::rdsinstancecpu",
}; };
my $StatisticsType = "Average,Minimum,Maximum,Sum,SampleCount"; my $StatisticsType = "Average,Minimum,Maximum,Sum,SampleCount";

View File

@ -51,7 +51,7 @@ sub new {
$options{options}->add_options( $options{options}->add_options(
arguments => { arguments => {
"state:s" => { name => 'state', default => 'all' }, "state:s" => { name => 'state', default => 'all' },
"no-includeallinstances" => { name => 'includeallinstances' }, "no-includeallinstances" => { name => 'includeallinstances' },
"exclude:s" => { name => 'exclude' }, "exclude:s" => { name => 'exclude' },
"instanceid:s" => { name => 'instanceid' } "instanceid:s" => { name => 'instanceid' }
@ -62,45 +62,43 @@ sub new {
} }
sub check_options { sub check_options {
my ( $self, %options ) = @_; my ($self, %options) = @_;
$self->SUPER::init(%options); $self->SUPER::init(%options);
} }
sub manage_selection { sub manage_selection {
my ( $self, %options ) = @_; my ($self, %options) = @_;
my ( @result, $awsapi ); my (@result, $awsapi);
# Getting some parameters # Getting some parameters
# includeallinstances # includeallinstances
if ( defined( $self->{option_results}->{includeallinstances} ) ) { if (defined($self->{option_results}->{includeallinstances})) {
$self->{option_results}->{includeallinstances} = JSON::false; $self->{option_results}->{includeallinstances} = JSON::false;
} } else {
else {
$self->{option_results}->{includeallinstances} = JSON::true; $self->{option_results}->{includeallinstances} = JSON::true;
} }
# states # states
if ( $self->{option_results}->{state} eq 'all' ) { if ($self->{option_results}->{state} eq 'all') {
@{ $self->{option_results}->{statetab} } = keys(%EC2_instance_states); @{$self->{option_results}->{statetab} } = keys %EC2_instance_states;
} } else {
else { @{$self->{option_results}->{statetab}} = split /,/, $self->{option_results}->{state};
@{ $self->{option_results}->{statetab} } = split( /,/, $self->{option_results}->{state} ); foreach my $curstate (@{$self->{option_results}->{statetab}}) {
foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) { if (!grep { /^$curstate$/ } keys(%EC2_instance_states)) {
if ( !grep { /^$curstate$/ } keys(%EC2_instance_states) ) { $self->{output}->add_option_msg(severity => 'UNKNOWN', short_msg => "The state doesn't exist.");
$self->{output}->add_option_msg( severity => 'UNKNOWN', short_msg => "The state doesn't exist." );
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
} }
} }
# exclusions # exclusions
if ( defined( $self->{option_results}->{exclude} ) ) { if (defined($self->{option_results}->{exclude})) {
my @excludetab = split( /,/, $self->{option_results}->{exclude} ); my @excludetab = split /,/, $self->{option_results}->{exclude};
my %array1 = map { $_ => 1 } @excludetab; my %array1 = map { $_ => 1 } @excludetab;
@{ $self->{option_results}->{statetab} } = grep { not $array1{$_} } @{ $self->{option_results}->{statetab} }; @{$self->{option_results}->{statetab}} = grep { not $array1{$_} } @{$self->{option_results}->{statetab}};
} }
my $states = join(',',@{ $self->{option_results}->{statetab} }); my $states = join(',',@{$self->{option_results}->{statetab}});
# Getting data from AWS # Getting data from AWS
# Building JSON # Building JSON
@ -114,9 +112,9 @@ sub manage_selection {
}], }],
}; };
# InstanceIds # InstanceIds
if ( defined( $self->{option_results}->{instanceid} ) ) { if (defined($self->{option_results}->{instanceid})) {
my @InstanceIds = split(/,/,$self->{option_results}->{instanceid}); my @InstanceIds = split(/,/, $self->{option_results}->{instanceid});
@{$apiRequest->{json}{'InstanceIds'}} = @InstanceIds; @{$apiRequest->{json}{InstanceIds}} = @InstanceIds;
} }
# Requesting API # Requesting API
@ -124,22 +122,22 @@ sub manage_selection {
$self->{command_return} = $awsapi->execReq($apiRequest); $self->{command_return} = $awsapi->execReq($apiRequest);
# Compute data # Compute data
$self->{option_results}->{instancecount}->{'total'} = '0'; $self->{option_results}->{instancecount}->{total} = 0;
foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) { foreach my $curstate (@{$self->{option_results}->{statetab}}) {
$self->{option_results}->{instancecount}->{$curstate} = '0'; $self->{option_results}->{instancecount}->{$curstate} = 0;
} }
foreach my $l ( @{ $self->{command_return}->{InstanceStatuses} } ) { foreach my $l (@{$self->{command_return}->{InstanceStatuses}}) {
$self->{result}->{instance}->{ $l->{InstanceId} } = $l->{InstanceState}->{Name}; $self->{result}->{instance}->{$l->{InstanceId}} = $l->{InstanceState}->{Name};
# long output for each instance # long output for each instance
$self->{output}->output_add( long_msg => "'" . $l->{InstanceId} . "' [state = " . $l->{InstanceState}->{Name} . ']' ); $self->{output}->output_add(long_msg => "'" . $l->{InstanceId} . "' [state = " . $l->{InstanceState}->{Name} . ']');
foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) { foreach my $curstate (@{$self->{option_results}->{statetab}}) {
if ( $l->{InstanceState}->{Name} eq $curstate ) { if ($l->{InstanceState}->{Name} eq $curstate) {
$self->{option_results}->{instancecount}->{$curstate}++; $self->{option_results}->{instancecount}->{$curstate}++;
} }
} }
$self->{option_results}->{instancecount}->{'total'}++; $self->{option_results}->{instancecount}->{total}++;
} }
} }
@ -158,16 +156,16 @@ sub run {
value => $self->{option_results}->{instancecount}->{'total'}, value => $self->{option_results}->{instancecount}->{'total'},
); );
foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) { foreach my $curstate (@{$self->{option_results}->{statetab}}) {
$self->{output}->perfdata_add( $self->{output}->perfdata_add(
label => $curstate, label => $curstate,
value => $self->{option_results}->{instancecount}->{$curstate}, value => $self->{option_results}->{instancecount}->{$curstate},
); );
# Most critical state # Most critical state
if ( $self->{option_results}->{instancecount}->{$curstate} != '0' ) { if ($self->{option_results}->{instancecount}->{$curstate} != 0) {
$exit_code = $EC2_instance_states{$curstate}; $exit_code = $EC2_instance_states{$curstate};
$exit_code = $self->{output}->get_most_critical( status => [ $exit_code, $old_status ] ); $exit_code = $self->{output}->get_most_critical(status => [ $exit_code, $old_status ]);
$old_status = $exit_code; $old_status = $exit_code;
} }
} }
@ -175,7 +173,7 @@ sub run {
# Output message # Output message
$self->{output}->output_add( $self->{output}->output_add(
severity => $exit_code, severity => $exit_code,
short_msg => sprintf( "Total instances: %s", $self->{option_results}->{instancecount}->{'total'} ) short_msg => sprintf("Total instances: %s", $self->{option_results}->{instancecount}->{total})
); );
$self->{output}->display(); $self->{output}->display();

View File

@ -51,29 +51,24 @@ sub new {
} }
sub check_options { sub check_options {
my ( $self, %options ) = @_; my ($self, %options) = @_;
$self->SUPER::init(%options); $self->SUPER::init(%options);
} }
sub api_request { sub api_request {
my ( $self, %options ) = @_; my ($self, %options) = @_;
@{ $self->{option_results}->{servicetab} } = @{$self->{option_results}->{servicetab}} = split( /,/, $self->{option_results}->{service} );
split( /,/, $self->{option_results}->{service} ); foreach my $service (@{$self->{option_results}->{servicetab}}) {
foreach my $service ( @{ $self->{option_results}->{servicetab} } ) { $self->{result}->{count}->{$service} = 0;
$self->{result}->{count}->{$service} = '0'; if ($service eq 'EC2') {
if ( $service eq 'EC2' ) {
$self->EC2(%options); $self->EC2(%options);
} } elsif ($service eq 'S3') {
elsif ( $service eq 'S3' ) {
$self->S3(%options); $self->S3(%options);
} } elsif ($service eq 'RDS') {
elsif ( $service eq 'RDS' ) {
$self->RDS(%options); $self->RDS(%options);
} } else {
else { $self->{output}->add_option_msg(short_msg => "Service $service doesn't exists" );
$self->{output}->add_option_msg(
short_msg => "Service $service doesn't exists" );
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
} }
@ -103,16 +98,16 @@ sub EC2 {
$self->{command_return} = $awsapi->execReq($apiRequest); $self->{command_return} = $awsapi->execReq($apiRequest);
# Compute data # Compute data
foreach my $instance ( @{ $self->{command_return}->{Reservations} } ) { foreach my $instance (@{$self->{command_return}->{Reservations}}) {
foreach my $tags ( @{ $instance->{Instances}[0]->{Tags} } ) { foreach my $tags (@{$instance->{Instances}[0]->{Tags}}) {
if ( $tags->{Key} eq 'Name' ) { if ($tags->{Key} eq 'Name') {
$instance->{Instances}[0]->{Name} = $tags->{Value}; $instance->{Instances}[0]->{Name} = $tags->{Value};
} }
} }
$self->{result}->{'EC2'}->{ $instance->{Instances}[0]->{InstanceId} } = $self->{result}->{'EC2'}->{$instance->{Instances}[0]->{InstanceId}} =
{ {
'State' => $instance->{Instances}[0]->{State}->{Name}, State => $instance->{Instances}[0]->{State}->{Name},
'Name' => $instance->{Instances}[0]->{Name} Name => $instance->{Instances}[0]->{Name}
}; };
$self->{result}->{count}->{'EC2'}++; $self->{result}->{count}->{'EC2'}++;
@ -134,16 +129,16 @@ sub S3 {
$self->{command_return} = $awsapi->execReq($apiRequest); $self->{command_return} = $awsapi->execReq($apiRequest);
# Exec command # Exec command
foreach my $line ( @{ $self->{command_return} } ) { foreach my $line (@{$self->{command_return}}) {
my ( $date, $time, $name ) = split( / /, $line ); my ($date, $time, $name) = split / /, $line;
my $creationdate = $date . " " . $time; my $creationdate = $date . " " . $time;
push( @buckets, { Name => $name, CreationDate => $creationdate } ); push(@buckets, { Name => $name, CreationDate => $creationdate });
} }
# Compute data # Compute data
foreach my $bucket (@buckets) { foreach my $bucket (@buckets) {
$self->{result}->{'S3'}->{ $bucket->{Name} } = $self->{result}->{'S3'}->{ $bucket->{Name} } =
{ 'Creation date' => $bucket->{CreationDate} }; { Creation date => $bucket->{CreationDate} };
$self->{result}->{count}->{'S3'}++; $self->{result}->{count}->{'S3'}++;
} }
} }
@ -161,12 +156,12 @@ sub RDS {
$self->{command_return} = $awsapi->execReq($apiRequest); $self->{command_return} = $awsapi->execReq($apiRequest);
# Compute data # Compute data
foreach my $dbinstance ( @{ $self->{command_return}->{DBInstances} } ) { foreach my $dbinstance (@{$self->{command_return}->{DBInstances}}) {
$self->{result}->{'RDS'}->{ $dbinstance->{DBInstanceIdentifier} } = { $self->{result}->{'RDS'}->{$dbinstance->{DBInstanceIdentifier}} = {
'State' => $dbinstance->{DBInstanceStatus}, State => $dbinstance->{DBInstanceStatus},
'Name' => $dbinstance->{DBInstanceIdentifier} Name => $dbinstance->{DBInstanceIdentifier}
}; };
$self->{result}->{count}->{'RDS'}++; $self->{result}->{count}->{RDS}++;
} }
} }
@ -181,9 +176,8 @@ sub disco_show {
my ( $self, %options ) = @_; my ( $self, %options ) = @_;
$self->api_request(%options); $self->api_request(%options);
foreach my $service (@Disco_service_tab) {
foreach my $service ( @Disco_service_tab ) { foreach my $device (keys %{$self->{result}->{$service}}) {
foreach my $device ( keys %{ $self->{result}->{$service} } ) {
$self->{output}->add_disco_entry( $self->{output}->add_disco_entry(
name => $self->{result}->{$service}->{$device}->{Name}, name => $self->{result}->{$service}->{$device}->{Name},
id => $device, id => $device,
@ -200,14 +194,11 @@ sub run {
$self->api_request(%options); $self->api_request(%options);
# Send formated data to Centreon # Send formated data to Centreon
foreach my $service ( @{ $self->{option_results}->{servicetab} } ) { foreach my $service (@{$self->{option_results}->{servicetab}}) {
$self->{output} $self->{output}->output_add(long_msg => sprintf("AWS service: %s", $service));
->output_add( long_msg => sprintf( "AWS service: %s", $service ) ); foreach my $device (keys %{$self->{result}->{$service}}) {
foreach my $device ( keys %{ $self->{result}->{$service} } ) {
my $output = $device . " ["; my $output = $device . " [";
foreach my $value ( foreach my $value (sort(keys %{$self->{result}->{$service}->{$device}})) {
sort( keys %{ $self->{result}->{$service}->{$device} } ) )
{
$output = $output =
$output $output
. $value . " = " . $value . " = "