tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-07-27 23:54:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ enhance a little

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
centreon-plugins/cloud/aws/custom/awscli.pm
View File

@ -23,7 +23,6 @@ package cloud::aws::custom::awscli;
use strict;
use warnings;
use JSON;
use Data::Dumper;
use centreon::plugins::misc;
sub new {
@ -53,15 +52,10 @@ sub new {
"sudo" => { name => 'sudo' },
} );
}
$options{options}->add_help(
package => __PACKAGE__,
sections => 'AWSCLI OPTIONS',
once => 1
);
$options{options}->add_help(package => __PACKAGE__, sections => 'AWSCLI OPTIONS', once => 1);
$self->{output} = $options{output};
$self->{mode} = $options{mode};
return $self;
}
@ -78,8 +72,6 @@ sub set_options {
sub set_defaults {
my ( $self, %options ) = @_;
# options{default}
# Manage default value
foreach ( keys %{ $options{default} } ) {
if ( $_ eq $self->{mode} ) {
@ -130,8 +122,7 @@ sub execReq {
);
my @return = split /\n/, $self->{stdout};
$jsoncontent = $json->encode( [@return] );
}
else {
} else {
$jsoncontent = centreon::plugins::misc::execute(
output => $self->{output},
options => $self->{option_results},

13
centreon-plugins/cloud/aws/mode/cloudwatch.pm
View File

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

24
centreon-plugins/cloud/aws/mode/instancestate.pm
View File

@ -75,17 +75,15 @@ sub manage_selection {
# includeallinstances
if (defined($self->{option_results}->{includeallinstances})) {
$self->{option_results}->{includeallinstances} = JSON::false;
}
else {
} else {
$self->{option_results}->{includeallinstances} = JSON::true;
}
# states
if ($self->{option_results}->{state} eq 'all') {
@{ $self->{option_results}->{statetab} } = keys(%EC2_instance_states);
}
else {
@{ $self->{option_results}->{statetab} } = split( /,/, $self->{option_results}->{state} );
@{$self->{option_results}->{statetab} } = keys %EC2_instance_states;
} else {
@{$self->{option_results}->{statetab}} = split /,/, $self->{option_results}->{state};
foreach my $curstate (@{$self->{option_results}->{statetab}}) {
if (!grep { /^$curstate$/ } keys(%EC2_instance_states)) {
$self->{output}->add_option_msg(severity => 'UNKNOWN', short_msg => "The state doesn't exist.");
@ -96,7 +94,7 @@ sub manage_selection {
# exclusions
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;
@{$self->{option_results}->{statetab}} = grep { not $array1{$_} } @{$self->{option_results}->{statetab}};
}
@ -116,7 +114,7 @@ sub manage_selection {
# InstanceIds
if (defined($self->{option_results}->{instanceid})) {
my @InstanceIds = split(/,/, $self->{option_results}->{instanceid});
@{$apiRequest->{json}{'InstanceIds'}} = @InstanceIds;
@{$apiRequest->{json}{InstanceIds}} = @InstanceIds;
}
# Requesting API
@ -124,9 +122,9 @@ sub manage_selection {
$self->{command_return} = $awsapi->execReq($apiRequest);
# Compute data
$self->{option_results}->{instancecount}->{'total'} = '0';
$self->{option_results}->{instancecount}->{total} = 0;
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}}) {
$self->{result}->{instance}->{$l->{InstanceId}} = $l->{InstanceState}->{Name};
@ -139,7 +137,7 @@ sub manage_selection {
$self->{option_results}->{instancecount}->{$curstate}++;
}
}
$self->{option_results}->{instancecount}->{'total'}++;
$self->{option_results}->{instancecount}->{total}++;
}
}
@ -165,7 +163,7 @@ sub run {
);
# 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 = $self->{output}->get_most_critical(status => [ $exit_code, $old_status ]);
$old_status = $exit_code;
@ -175,7 +173,7 @@ sub run {
# Output message
$self->{output}->output_add(
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();

39
centreon-plugins/cloud/aws/mode/list.pm
View File

@ -58,22 +58,17 @@ sub check_options {
sub api_request {
my ($self, %options) = @_;
@{ $self->{option_results}->{servicetab} } =
split( /,/, $self->{option_results}->{service} );
@{$self->{option_results}->{servicetab}} = split( /,/, $self->{option_results}->{service} );
foreach my $service (@{$self->{option_results}->{servicetab}}) {
$self->{result}->{count}->{$service} = '0';
$self->{result}->{count}->{$service} = 0;
if ($service eq 'EC2') {
$self->EC2(%options);
}
elsif ( $service eq 'S3' ) {
} elsif ($service eq 'S3') {
$self->S3(%options);
}
elsif ( $service eq 'RDS' ) {
} elsif ($service eq 'RDS') {
$self->RDS(%options);
}
else {
$self->{output}->add_option_msg(
short_msg => "Service $service doesn't exists" );
} else {
$self->{output}->add_option_msg(short_msg => "Service $service doesn't exists" );
$self->{output}->option_exit();
}
}
@ -111,8 +106,8 @@ sub EC2 {
}
$self->{result}->{'EC2'}->{$instance->{Instances}[0]->{InstanceId}} =
{
'State' => $instance->{Instances}[0]->{State}->{Name},
'Name' => $instance->{Instances}[0]->{Name}
State => $instance->{Instances}[0]->{State}->{Name},
Name => $instance->{Instances}[0]->{Name}
};
$self->{result}->{count}->{'EC2'}++;
@ -135,7 +130,7 @@ sub S3 {
# Exec command
foreach my $line (@{$self->{command_return}}) {
my ( $date, $time, $name ) = split( / /, $line );
my ($date, $time, $name) = split / /, $line;
my $creationdate = $date . " " . $time;
push(@buckets, { Name => $name, CreationDate => $creationdate });
}
@ -143,7 +138,7 @@ sub S3 {
# Compute data
foreach my $bucket (@buckets) {
$self->{result}->{'S3'}->{ $bucket->{Name} } =
{ 'Creation date' => $bucket->{CreationDate} };
{ Creation date => $bucket->{CreationDate} };
$self->{result}->{count}->{'S3'}++;
}
}
@ -163,10 +158,10 @@ sub RDS {
# Compute data
foreach my $dbinstance (@{$self->{command_return}->{DBInstances}}) {
$self->{result}->{'RDS'}->{$dbinstance->{DBInstanceIdentifier}} = {
'State' => $dbinstance->{DBInstanceStatus},
'Name' => $dbinstance->{DBInstanceIdentifier}
State => $dbinstance->{DBInstanceStatus},
Name => $dbinstance->{DBInstanceIdentifier}
};
$self->{result}->{count}->{'RDS'}++;
$self->{result}->{count}->{RDS}++;
}
}
@ -181,7 +176,6 @@ sub disco_show {
my ( $self, %options ) = @_;
$self->api_request(%options);
foreach my $service (@Disco_service_tab) {
foreach my $device (keys %{$self->{result}->{$service}}) {
$self->{output}->add_disco_entry(
@ -201,13 +195,10 @@ sub run {
# Send formated data to Centreon
foreach my $service (@{$self->{option_results}->{servicetab}}) {
$self->{output}
->output_add( long_msg => sprintf( "AWS service: %s", $service ) );
$self->{output}->output_add(long_msg => sprintf("AWS service: %s", $service));
foreach my $device (keys %{$self->{result}->{$service}}) {
my $output = $device . " [";
foreach my $value (
sort( keys %{ $self->{result}->{$service}->{$device} } ) )
{
foreach my $value (sort(keys %{$self->{result}->{$service}->{$device}})) {
$output =
$output
. $value . " = "