diff --git a/centreon-plugins/cloud/aws/apigateway/mode/latency.pm b/centreon-plugins/cloud/aws/apigateway/mode/latency.pm
new file mode 100644
index 000000000..1c1b75570
--- /dev/null
+++ b/centreon-plugins/cloud/aws/apigateway/mode/latency.pm
@@ -0,0 +1,200 @@
+#
+# Copyright 2019 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::aws::apigateway::mode::latency;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+my %metrics_mapping = (
+    'Latency' => {
+        'output' => 'Client Latency',
+        'output_unit' => 'ms',
+        'perfdata_unit' => 'ms',
+        'label' => 'client-latency',
+        'nlabel' => 'apigateway.client.latency.ms'
+    },
+    'IntegrationLatency' => {
+        'output' => 'Integration Latency',
+        'output_unit' => 'ms',
+        'perfdata_unit' => 'ms',
+        'label' => 'backend-latency',
+        'nlabel' => 'apigateway.backend.latency.ms'
+    },
+);
+
+sub prefix_metric_output {
+    my ($self, %options) = @_;
+    
+    return ucfirst("'" . $options{instance_value}->{display} . "' ");
+}
+
+sub prefix_statistics_output {
+    my ($self, %options) = @_;
+    
+    return "Statistic: '" . $options{instance_value}->{display} . "' ";
+}
+
+sub long_output {
+    my ($self, %options) = @_;
+
+    return "Checking " . $options{instance_value}->{display} . "' ";
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'metrics', type => 3, cb_prefix_output => 'prefix_metric_output', cb_long_output => 'long_output',
+          message_multiple => 'All API latency metrics are ok', indent_long_output => '    ',
+            group => [
+                { name => 'statistics', display_long => 1, cb_prefix_output => 'prefix_statistics_output',
+                  message_multiple => 'All metrics are ok', type => 1, skipped_code => { -10 => 1 } },
+            ]
+        }        
+    ];
+
+    foreach my $metric (keys %metrics_mapping) {
+        my $entry = {
+            label => $metrics_mapping{$metric}->{label},
+            nlabel => $metrics_mapping{$metric}->{nlabel},
+            set => {
+                key_values => [ { name => $metric }, { name => 'display' } ],
+                output_template => $metrics_mapping{$metric}->{output} . ': %.2f ' . $metrics_mapping{$metric}->{output_unit},
+                perfdatas => [
+                    { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1,
+                    perfdata_unit => $metrics_mapping{$metric}->{perfdata_unit} }
+                ],
+            }
+        };
+        push @{$self->{maps_counters}->{statistics}}, $entry;
+    }
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, force_new_perfdata => 1,  %options);
+    bless $self, $class;
+    
+    $options{options}->add_options(arguments =>
+                                {
+                                    "api-name:s@"   => { name => 'api_name' },
+                                    "filter-metric:s" => { name => 'filter_metric' },
+                                });
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    foreach my $instance (@{$self->{option_results}->{api_name}}) {
+        if ($instance ne '') {
+            push @{$self->{aws_instance}}, $instance;
+        }
+    }
+
+    $self->{aws_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 600;
+    $self->{aws_period} = defined($self->{option_results}->{period}) ? $self->{option_results}->{period} : 60;
+    
+    $self->{aws_statistics} = ['Average'];
+    if (defined($self->{option_results}->{statistic})) {
+        $self->{aws_statistics} = [];
+        foreach my $stat (@{$self->{option_results}->{statistic}}) {
+            if ($stat ne '') {
+                push @{$self->{aws_statistics}}, ucfirst(lc($stat));
+            }
+        }
+    }
+
+    foreach my $metric (keys %metrics_mapping) {
+        next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
+            && $metric !~ /$self->{option_results}->{filter_metric}/);
+
+        push @{$self->{aws_metrics}}, $metric;
+    }
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my %metric_results;
+    foreach my $instance (@{$self->{aws_instance}}) {
+        $metric_results{$instance} = $options{custom}->cloudwatch_get_metrics(
+            region => $self->{option_results}->{region},
+            namespace => 'AWS/ApiGateway',
+            dimensions => [ { Name => 'ApiName', Value => $instance } ],
+            metrics => $self->{aws_metrics},
+            statistics => $self->{aws_statistics},
+            timeframe => $self->{aws_timeframe},
+            period => $self->{aws_period},
+        );
+        foreach my $metric (@{$self->{aws_metrics}}) {
+            foreach my $statistic (@{$self->{aws_statistics}}) {
+                next if (!defined($metric_results{$instance}->{$metric}->{lc($statistic)}) && !defined($self->{option_results}->{zeroed}));
+                $self->{metrics}->{$instance}->{display} = $instance;
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{display} = $statistic;
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{$metric} = defined($metric_results{$instance}->{$metric}->{lc($statistic)}) ? 
+                                                                                                $metric_results{$instance}->{$metric}->{lc($statistic)} : 0;
+            }
+        }
+    }
+
+    if (scalar(keys %{$self->{metrics}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
+        $self->{output}->option_exit();
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check metrics related to ApiGateway latencies
+Default statistic: 'sum'
+
+=over 8
+
+=item B<--api-name>
+
+Set the API name (Required) (Can be multiple).
+
+=item B<--filter-metric>
+
+Filter metrics (Can be: 'Latency', 'IntegrationLatency') 
+
+=item B<--warning-*>
+
+Thresholds warning
+star substitution possibilities: client-latency, backend-latency
+
+=item B<--critical-*>
+
+Thresholds critical
+star substitution possibilities: client-latency, backend-latency
+
+=back
+
+=cut
diff --git a/centreon-plugins/cloud/aws/apigateway/mode/requests.pm b/centreon-plugins/cloud/aws/apigateway/mode/requests.pm
new file mode 100644
index 000000000..f773225c7
--- /dev/null
+++ b/centreon-plugins/cloud/aws/apigateway/mode/requests.pm
@@ -0,0 +1,203 @@
+#
+# Copyright 2019 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::aws::apigateway::mode::requests;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+my %metrics_mapping = (
+    'Count' => {
+        'output' => 'Client Requests',
+        'label' => 'request-count',
+        'nlabel' => 'requests.count'
+    },
+    '4XXError' => {
+        'output' => 'HTTP 4XX Errors',
+        'label' => 'httpcode-4xx-errors',
+        'nlabel' => 'requests.httpcode.4xx.count'
+    },
+    '5XXError' => {
+        'output' => 'HTTP 5XX Errors',
+        'label' => 'httpcode-5xx-errors',
+        'nlabel' => 'requests.httpcode.5xx.count'
+    },
+);
+
+sub prefix_metric_output {
+    my ($self, %options) = @_;
+    
+    return " '" . $options{instance_value}->{display} . "' ";
+}
+
+sub prefix_statistics_output {
+    my ($self, %options) = @_;
+    
+    return "Statistic '" . $options{instance_value}->{display} . "' Metrics ";
+}
+
+sub long_output {
+    my ($self, %options) = @_;
+
+    return "Checking '" . $options{instance_value}->{display} . "' ";
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'metrics', type => 3, cb_prefix_output => 'prefix_metric_output', cb_long_output => 'long_output',
+          message_multiple => 'All requests metrics are ok', indent_long_output => '    ',
+            group => [
+                { name => 'statistics', display_long => 1, cb_prefix_output => 'prefix_statistics_output',
+                  message_multiple => 'All requests are ok', type => 1, skipped_code => { -10 => 1 } },
+            ]
+        }    
+    ];
+
+    foreach my $metric (keys %metrics_mapping) {
+        my $entry = {
+            label => $metrics_mapping{$metric}->{label},
+            nlabel => $metrics_mapping{$metric}->{nlabel},
+            set => {
+                key_values => [ { name => $metric }, { name => 'display' } ],
+                output_template => $metrics_mapping{$metric}->{output} . ': %.2f',
+                perfdatas => [
+                    { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 }
+                ],
+            }
+        };
+        push @{$self->{maps_counters}->{statistics}}, $entry;
+    }
+
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, force_new_perfdata => 1,  %options);
+    bless $self, $class;
+    
+    $options{options}->add_options(arguments =>
+                                {
+                                    "api-name:s@"	  => { name => 'api_name' },
+                                    "filter-metric:s" => { name => 'filter_metric' },
+                                });
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    foreach my $instance (@{$self->{option_results}->{api_name}}) {
+        if ($instance ne '') {
+            push @{$self->{aws_instance}}, $instance;
+        }
+    }
+
+    $self->{aws_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 600;
+    $self->{aws_period} = defined($self->{option_results}->{period}) ? $self->{option_results}->{period} : 60;
+    
+    $self->{aws_statistics} = ['Sum'];
+    if (defined($self->{option_results}->{statistic})) {
+        $self->{aws_statistics} = [];
+        foreach my $stat (@{$self->{option_results}->{statistic}}) {
+            if ($stat ne '') {
+                push @{$self->{aws_statistics}}, ucfirst(lc($stat));
+            }
+        }
+    }
+
+    foreach my $metric (keys %metrics_mapping) {
+        next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
+            && $metric !~ /$self->{option_results}->{filter_metric}/);
+
+        push @{$self->{aws_metrics}}, $metric;
+    }
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my %metric_results;
+    foreach my $instance (@{$self->{aws_instance}}) {
+        $metric_results{$instance} = $options{custom}->cloudwatch_get_metrics(
+            region => $self->{option_results}->{region},
+            namespace => 'AWS/ApiGateway',
+            dimensions => [ { Name => 'ApiName', Value => $instance } ],
+            metrics => $self->{aws_metrics},
+            statistics => $self->{aws_statistics},
+            timeframe => $self->{aws_timeframe},
+            period => $self->{aws_period},
+        );
+
+        foreach my $metric (@{$self->{aws_metrics}}) {
+            foreach my $statistic (@{$self->{aws_statistics}}) {
+                next if (!defined($metric_results{$instance}->{$metric}->{lc($statistic)}) && !defined($self->{option_results}->{zeroed}));
+
+                $self->{metrics}->{$instance}->{display} = $instance;
+                $self->{metrics}->{$instance}->{availability_zone} = $self->{option_results}->{availability_zone};
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{display} = $statistic;
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{$metric} = defined($metric_results{$instance}->{$metric}->{lc($statistic)}) ? $metric_results{$instance}->{$metric}->{lc($statistic)} : 0;
+            }
+        }
+    }
+    
+    if (scalar(keys %{$self->{metrics}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
+        $self->{output}->option_exit();
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check metrics related to ApiGateway requests
+Default statistic: 'sum'
+
+=over 8
+
+=item B<--api-name>
+
+Set the api name (Required) (Can be multiple).
+
+=item B<--filter-metric>
+
+Filter metrics (Can be: 'Count', '4XXError', '5XXError') 
+
+=item B<--warning-*>
+
+Thresholds warning 
+star substitusion possibilities: request-count, httpcode-4xx-errors, httpcode-5xx-errors
+
+=item B<--critical-*>
+
+Thresholds critical
+star substitusion possibilities: request-count, httpcode-4xx-errors, httpcode-5xx-errors
+
+=back
+
+=cut
diff --git a/centreon-plugins/cloud/aws/apigateway/plugin.pm b/centreon-plugins/cloud/aws/apigateway/plugin.pm
new file mode 100644
index 000000000..d870849f7
--- /dev/null
+++ b/centreon-plugins/cloud/aws/apigateway/plugin.pm
@@ -0,0 +1,51 @@
+#
+# Copyright 2019 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::aws::apigateway::plugin;
+
+use strict;
+use warnings;
+use base qw(centreon::plugins::script_custom);
+
+sub new {
+    my ( $class, %options ) = @_;
+    my $self = $class->SUPER::new( package => __PACKAGE__, %options );
+    bless $self, $class;
+
+    $self->{version} = '0.1';
+    %{ $self->{modes} } = (
+        'requests'           => 'cloud::aws::apigateway::mode::requests',
+        'latency'            => 'cloud::aws::apigateway::mode::latency',
+    );
+
+    $self->{custom_modes}{paws} = 'cloud::aws::custom::paws';
+    $self->{custom_modes}{awscli} = 'cloud::aws::custom::awscli';
+    return $self;
+}
+
+1;
+
+__END__
+
+=head1 PLUGIN DESCRIPTION
+
+Check Amazon API Gateway (AmazonApiGateway).
+
+=cut
diff --git a/centreon-plugins/cloud/aws/kinesis/mode/recordsstats.pm b/centreon-plugins/cloud/aws/kinesis/mode/recordsstats.pm
new file mode 100644
index 000000000..9ff5857c9
--- /dev/null
+++ b/centreon-plugins/cloud/aws/kinesis/mode/recordsstats.pm
@@ -0,0 +1,242 @@
+#
+# Copyright 2019 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::aws::kinesis::mode::recordsstats;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+my %metrics_mapping = (
+    'GetRecords.IteratorAgeMilliseconds' => {
+        'output' => 'Get Records Iterator Age',
+        'label' => 'get-record-iterator-age',
+        'nlabel' => 'kinesis.stream.records.get.iteratorage.ms',
+        'perf_unit' => 'ms',
+        'change_bytes' => '0',
+        'stats' => { 'sum' => 'false' }
+    },
+    'GetRecords.Bytes' => {
+        'output' => 'Get Records Bytes',
+        'label' => 'get-record-bytes',
+        'nlabel' => 'kinesis.stream.get.records.bytes',
+        'perf_unit' => 'B',
+        'change_bytes' => '2',
+    },
+    'GetRecords.Latency' => {
+        'output' => 'Get Records Latency',
+        'label' => 'get-record-latency',
+        'nlabel' => 'kinesis.stream.get.records.latency.ms',
+        'perf_unit' => 'ms',
+        'change_bytes' => '0',
+        'stats' => { 'sum' => 'false' }
+    },
+    'GetRecords.Success' => {
+        'output' => 'Get Records Success',
+        'label' => 'get-record-success',
+        'nlabel' => 'kinesis.stream.get.records.success.count',
+        'perf_unit' => '',
+        'change_bytes' => '0',
+        'stats' => { 'average' => 'false' }
+    },
+    'PutRecord.Latency' => {
+        'output' => 'Put Records Latency',
+        'label' => 'put-record-latency',
+        'nlabel' => 'kinesis.stream.put.records.latency.ms',
+        'perf_unit' => 'ms',
+        'change_bytes' => '0',
+        'stats' => { 'sum' => 'false' }
+    },
+    'PutRecord.Bytes' => {
+        'output' => 'Put Records Bytes',
+        'label' => 'put-record-bytes',
+        'nlabel' => 'kinesis.stream.put.records.bytes',
+        'perf_unit' => 'B',
+        'change_bytes' => '2'
+    },
+    'PutRecord.Success' => {
+        'output' => 'Put Records Success',
+        'label' => 'put-record-success',
+        'nlabel' => 'kinesis.stream.put.records.success.count',
+        'perf_unit' => '',
+        'change_bytes' => '0',
+        'stats' => { 'average' => 'false' }
+    },
+);
+
+sub prefix_metric_output {
+    my ($self, %options) = @_;
+    
+    return " '" . $options{instance_value}->{display} . "' ";
+}
+
+sub prefix_statistics_output {
+    my ($self, %options) = @_;
+    
+    return "Statistic '" . $options{instance_value}->{display} . "' Metrics ";
+}
+
+sub long_output {
+    my ($self, %options) = @_;
+
+    return "Checking'" . $options{instance_value}->{display} . "' ";
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'metrics', type => 3, cb_prefix_output => 'prefix_metric_output', cb_long_output => 'long_output',
+          message_multiple => 'All records to streams metrics are ok', indent_long_output => '    ',
+            group => [
+                { name => 'statistics', display_long => 1, cb_prefix_output => 'prefix_statistics_output',
+                  message_multiple => 'All records to streams metrics are ok', type => 1, skipped_code => { -10 => 1 } },
+            ]
+        }
+    ];
+
+    foreach my $metric (keys %metrics_mapping) {
+        my $entry = {
+            label => $metrics_mapping{$metric}->{label},
+            nlabel => $metrics_mapping{$metric}->{nlabel},
+            set => {
+                key_values => [ { name => $metric }, { name => 'display' } ],
+                output_template => ($metrics_mapping{$metric}->{change_bytes} != 0) ? $metrics_mapping{$metric}->{output} . ': %.2f %s' : $metrics_mapping{$metric}->{output} . ': %.2f',
+                change_bytes => $metrics_mapping{$metric}->{output_change_bytes},
+                perfdatas => [
+                    { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1, unit => $metrics_mapping{$metric}->{perf_unit} }
+                ],
+            }
+        };
+        push @{$self->{maps_counters}->{statistics}}, $entry;
+    }
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, force_new_perfdata => 1,  %options);
+    bless $self, $class;
+    
+    $options{options}->add_options(arguments =>
+                                {
+                                    "stream-name:s@"  => { name => 'stream_name' },
+                                    "filter-metric:s" => { name => 'filter_metric' },
+                                });
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    foreach my $instance (@{$self->{option_results}->{stream_name}}) {
+        if ($instance ne '') {
+            push @{$self->{aws_instance}}, $instance;
+        }
+    }
+
+    $self->{aws_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 600;
+    $self->{aws_period} = defined($self->{option_results}->{period}) ? $self->{option_results}->{period} : 60;
+    
+    $self->{aws_statistics} = ['Average','Sum'];
+    if (defined($self->{option_results}->{statistic})) {
+        $self->{aws_statistics} = [];
+        foreach my $stat (@{$self->{option_results}->{statistic}}) {
+            if ($stat ne '') {
+                push @{$self->{aws_statistics}}, ucfirst(lc($stat));
+            }
+        }
+    }
+
+    foreach my $metric (keys %metrics_mapping) {
+        next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
+            && $metric !~ /$self->{option_results}->{filter_metric}/);
+
+        push @{$self->{aws_metrics}}, $metric;
+    }
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my %metric_results;
+    foreach my $instance (@{$self->{aws_instance}}) {
+        $metric_results{$instance} = $options{custom}->cloudwatch_get_metrics(
+            region => $self->{option_results}->{region},
+            namespace => 'AWS/Kinesis',
+            dimensions => [ { Name => 'StreamName', Value => $instance } ],
+            metrics => $self->{aws_metrics},
+            statistics => $self->{aws_statistics},
+            timeframe => $self->{aws_timeframe},
+            period => $self->{aws_period},
+        );
+        foreach my $metric (@{$self->{aws_metrics}}) {
+            foreach my $statistic (@{$self->{aws_statistics}}) {
+                next if (!defined($metric_results{$instance}->{$metric}->{lc($statistic)}) && !defined($self->{option_results}->{zeroed}) 
+                            || defined($metrics_mapping{$metric}->{stats}->{lc($statistic)}) && $metrics_mapping{$metric}->{stats}->{lc($statistic)} eq "false");
+                $self->{metrics}->{$instance}->{display} = $instance;
+                $self->{metrics}->{$instance}->{availability_zone} = $self->{option_results}->{availability_zone};
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{display} = $statistic;
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{$metric} = defined($metric_results{$instance}->{$metric}->{lc($statistic)}) ? $metric_results{$instance}->{$metric}->{lc($statistic)} : 0;
+            }
+        }
+    }
+
+    if (scalar(keys %{$self->{metrics}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
+        $self->{output}->option_exit();
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check metrics about records statistics in Kinesis streams.
+
+=over 8
+
+=item B<--name>
+
+Set the stream name (Required) (Can be multiple).
+
+=item B<--filter-metric>
+
+Filter metrics (Can be: 'GetRecords.IteratorAgeMilliseconds', 'GetRecords.Bytes', ) 
+
+=item B<--warning-*>
+
+Thresholds warning
+can be: 'get-record-iterator-age', 'get-record-bytes', 'get-record-success', 'get-record-latency',
+'put-record-bytes', 'put-record-success', 'put-record-latency'
+
+=item B<--critical-*>
+
+Thresholds critical
+can be: 'get-record-iterator-age', 'get-record-bytes', 'get-record-success', 'get-record-latency',
+'put-record-bytes', 'put-record-success', 'put-record-latency'
+
+=back
+
+=cut
\ No newline at end of file
diff --git a/centreon-plugins/cloud/aws/kinesis/mode/streams.pm b/centreon-plugins/cloud/aws/kinesis/mode/streams.pm
new file mode 100644
index 000000000..93dbf9564
--- /dev/null
+++ b/centreon-plugins/cloud/aws/kinesis/mode/streams.pm
@@ -0,0 +1,217 @@
+#
+# Copyright 2019 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::aws::kinesis::mode::streams;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+my %metrics_mapping = (
+    'IncomingBytes' => {
+        'output' => 'Incoming Bytes',
+        'label' => 'incoming-bytes',
+        'nlabel' => 'kinesis.stream.incoming.bytes',
+        'perf_unit' => 'B',
+        'change_bytes' => '2'
+    },
+    'IncomingRecords' => {
+        'output' => 'Incoming Records',
+        'label' => 'incoming-records',
+        'nlabel' => 'kinesis.stream.incoming.records',
+        'perf_unit' => '',
+        'change_bytes' => '0',
+        'stats' => { 'average' => 'false' }
+    },
+    'OutgoingBytes' => {
+        'output' => 'Outgoing Bytes',
+        'label' => 'outgoing-bytes',
+        'nlabel' => 'kinesis.stream.outgoing.bytes',
+        'perf_unit' => 'B',
+        'change_bytes' => '2'
+    },
+    'OutgoingRecords' => {
+        'output' => 'Outgoing Records',
+        'label' => 'outgoing-records',
+        'nlabel' => 'kinesis.stream.outgoing.records',
+        'perf_unit' => '',
+        'change_bytes' => '0',
+        'stats' => { 'average' => 'false' }
+    },
+);
+
+sub prefix_metric_output {
+    my ($self, %options) = @_;
+    
+    return " '" . $options{instance_value}->{display} . "' ";
+}
+
+sub prefix_statistics_output {
+    my ($self, %options) = @_;
+    
+    return "Statistic '" . $options{instance_value}->{display} . "' Metrics ";
+}
+
+sub long_output {
+    my ($self, %options) = @_;
+
+    return "Checking'" . $options{instance_value}->{display} . "' ";
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'metrics', type => 3, cb_prefix_output => 'prefix_metric_output', cb_long_output => 'long_output',
+          message_multiple => 'All stream metrics are ok', indent_long_output => '    ',
+            group => [
+                { name => 'statistics', display_long => 1, cb_prefix_output => 'prefix_statistics_output',
+                  message_multiple => 'All stream metrics are ok', type => 1, skipped_code => { -10 => 1 } },
+            ]
+        }
+    ];
+
+    foreach my $metric (keys %metrics_mapping) {
+        my $entry = {
+            label => $metrics_mapping{$metric}->{label},
+            nlabel => $metrics_mapping{$metric}->{nlabel},
+            set => {
+                key_values => [ { name => $metric }, { name => 'display' } ],
+                output_template => ($metrics_mapping{$metric}->{change_bytes} != 0) ? $metrics_mapping{$metric}->{output} . ': %.2f %s' : $metrics_mapping{$metric}->{output} . ': %.2f',
+                change_bytes => $metrics_mapping{$metric}->{output_change_bytes},
+                perfdatas => [
+                    { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1, unit => $metrics_mapping{$metric}->{perf_unit} }
+                ],
+            }
+        };
+        push @{$self->{maps_counters}->{statistics}}, $entry;
+    }
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, force_new_perfdata => 1,  %options);
+    bless $self, $class;
+    
+    $options{options}->add_options(arguments =>
+                                {
+                                    "stream-name:s@"  => { name => 'stream_name' },
+                                    "filter-metric:s" => { name => 'filter_metric' },
+                                });
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    foreach my $instance (@{$self->{option_results}->{stream_name}}) {
+        if ($instance ne '') {
+            push @{$self->{aws_instance}}, $instance;
+        }
+    }
+
+    $self->{aws_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 600;
+    $self->{aws_period} = defined($self->{option_results}->{period}) ? $self->{option_results}->{period} : 60;
+    
+    $self->{aws_statistics} = ['Average','Sum'];
+    if (defined($self->{option_results}->{statistic})) {
+        $self->{aws_statistics} = [];
+        foreach my $stat (@{$self->{option_results}->{statistic}}) {
+            if ($stat ne '') {
+                push @{$self->{aws_statistics}}, ucfirst(lc($stat));
+            }
+        }
+    }
+
+    foreach my $metric (keys %metrics_mapping) {
+        next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
+            && $metric !~ /$self->{option_results}->{filter_metric}/);
+
+        push @{$self->{aws_metrics}}, $metric;
+    }
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my %metric_results;
+    foreach my $instance (@{$self->{aws_instance}}) {
+        $metric_results{$instance} = $options{custom}->cloudwatch_get_metrics(
+            region => $self->{option_results}->{region},
+            namespace => 'AWS/Kinesis',
+            dimensions => [ { Name => 'StreamName', Value => $instance } ],
+            metrics => $self->{aws_metrics},
+            statistics => $self->{aws_statistics},
+            timeframe => $self->{aws_timeframe},
+            period => $self->{aws_period},
+        );
+        foreach my $metric (@{$self->{aws_metrics}}) {
+            foreach my $statistic (@{$self->{aws_statistics}}) {
+                next if (!defined($metric_results{$instance}->{$metric}->{lc($statistic)}) && !defined($self->{option_results}->{zeroed}) 
+                            || defined($metrics_mapping{$metric}->{stats}->{lc($statistic)}) && $metrics_mapping{$metric}->{stats}->{lc($statistic)} eq "false");
+                $self->{metrics}->{$instance}->{display} = $instance;
+                $self->{metrics}->{$instance}->{availability_zone} = $self->{option_results}->{availability_zone};
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{display} = $statistic;
+                $self->{metrics}->{$instance}->{statistics}->{lc($statistic)}->{$metric} = defined($metric_results{$instance}->{$metric}->{lc($statistic)}) ? $metric_results{$instance}->{$metric}->{lc($statistic)} : 0;
+            }
+        }
+    }
+
+    if (scalar(keys %{$self->{metrics}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
+        $self->{output}->option_exit();
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check metrics for Kinesis streams.
+note: Outgoing* metrics are only available when enhanced stats are enabled (paid metrics) 
+
+=over 8
+
+=item B<--stream-name>
+
+Set the stream name (Required) (Can be multiple).
+
+=item B<--filter-metric>
+
+Filter metrics (Can be: 'IncomingBytes', 'IncomingRecords', 'OutgoingBytes', 'OutgoingRecords') 
+
+=item B<--warning-*>
+
+Thresholds warning
+can be: 'incoming-bytes', 'incoming-records', 'outgoing-bytes', 'outgoing-records'.
+
+=item B<--critical-*>
+
+Thresholds critical
+can be: 'incoming-bytes', 'incoming-records', 'outgoing-bytes', 'outgoing-records'.
+
+=back
+
+=cut
\ No newline at end of file
diff --git a/centreon-plugins/cloud/aws/kinesis/plugin.pm b/centreon-plugins/cloud/aws/kinesis/plugin.pm
new file mode 100644
index 000000000..ec65582c4
--- /dev/null
+++ b/centreon-plugins/cloud/aws/kinesis/plugin.pm
@@ -0,0 +1,51 @@
+#
+# Copyright 2019 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::aws::kinesis::plugin;
+
+use strict;
+use warnings;
+use base qw(centreon::plugins::script_custom);
+
+sub new {
+    my ( $class, %options ) = @_;
+    my $self = $class->SUPER::new( package => __PACKAGE__, %options );
+    bless $self, $class;
+
+    $self->{version} = '0.1';
+    %{ $self->{modes} } = (
+        'streams'       => 'cloud::aws::kinesis::mode::streams',
+        'records-stats' => 'cloud::aws::kinesis::mode::recordsstats'
+    );
+
+    $self->{custom_modes}{paws} = 'cloud::aws::custom::paws';
+    $self->{custom_modes}{awscli} = 'cloud::aws::custom::awscli';
+    return $self;
+}
+
+1;
+
+__END__
+
+=head1 PLUGIN DESCRIPTION
+
+Check Amazon Kinesis Stream related metrics (AWS/Kinesis Service).
+
+=cut