fluent-plugin-kinesis 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 304cad8054202f54af88f9eabb61b3795e2a5d5d
-  data.tar.gz: a8bbcb160baaccfcbe2eaf4514a0e1bb87d950f2
+  metadata.gz: 24d75eb607afb3a1a251ab9bac156cde85e5053e
+  data.tar.gz: 30bb3774c5c3f9f8aa5f921ed8e78a6bc49e495e
 SHA512:
-  metadata.gz: 3d6ad1a860cb384eb5d14063d53fd4490c85e57c815ca7442db1998d00a5b2455168164085d5911823a4046ecc48279b1ecf2de06937541a6f9e118a06ebf506
-  data.tar.gz: ff3da727150ee12fe731b63397a12f2dd54fc79d3adaf091c2504557cb2d29a3804adcc8fffa4c1b07f710a2ec8bf89ad4a53af30fd28637c9c62961f5a62b40
+  metadata.gz: 2b8d65b4999dc9ad78f88119ee166649dd96b3df1f1acadd707134333f14aa50f4052b58ca2870712e34f5a0bfd583a21c208c71e58538fd60cf6bd7d66e127d
+  data.tar.gz: 598e0b74f91110529ea4a89e22f1d62b5b8f55dd5860d76980001be4e4a7cc57514767fa58e7892741002794fec89c4537fe494dd2ab73e14c47871f8bbf1bb8

data/.travis.yml

@@ -2,33 +2,12 @@ language: ruby
 
 matrix:
   include:
-    - rvm: 2.0.0-p648
-      os: linux
-      gemfile: gemfiles/Gemfile.ruby-2.0
-    - rvm: 2.1.10
-      os: linux
-      gemfile: gemfiles/Gemfile.ruby-2.1
-    - rvm: 2.2.6
+    - rvm: 2.4.1
       os: linux
       gemfile: Gemfile
-    - rvm: 2.3.3
-      os: linux
-      gemfile: Gemfile
-    - rvm: 2.4.0
-      os: linux
-      gemfile: Gemfile
-    - rvm: 2.3.3
-      os: linux
-      gemfile: gemfiles/Gemfile.fluentd-0.10.58
-    - rvm: 2.3.3
+    - rvm: 2.1.10
       os: linux
       gemfile: gemfiles/Gemfile.fluentd-0.12
-    - rvm: 2.3.3
-      os: linux
-      gemfile: gemfiles/Gemfile.fluentd-0.14.11
-    - rvm: 2.3.3
-      os: linux
-      gemfile: gemfiles/Gemfile.aws-sdk-2.4
 
 script: bundle exec rake test
 

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 2.0.0
+
+- Feature - Add `kinesis_streams_aggregated` ouput plugin [#107](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/107)
+- Feature - Support fluentd worker model [#104](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/104)
+- Feature - Support AWS SDK for Ruby v3 [#102](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/102)
+- Enhancement - Refactor class design [#103](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/103)
+- Enhancement - More configuration for AssumeRole [#63](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/63)
+- Enhancement - Refactor credentials helper [#94](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/94)
+- Enhancement - Revisit backoff logic [#69](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/69)
+- Enhancement - Support compressing output [#98](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/98)
+- Enhancement - Support nanosecond time_key format [#124](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/124)
+- License - Move back to Apache License Version 2.0
+
 ## 1.3.0
 
 - Feature - Log KPL stdout/err to logger [#129](https://github.com/awslabs/aws-fluent-plugin-kinesis/pull/129) [#130](https://github.com/awslabs/aws-fluent-plugin-kinesis/pull/130)

data/Gemfile

@@ -1,16 +1,16 @@
 #
-#  Copyright 2014-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2014-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-#  Licensed under the Amazon Software License (the "License").
-#  You may not use this file except in compliance with the License.
-#  A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
 #
-#  http://aws.amazon.com/asl/
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-#  or in the "license" file accompanying this file. This file 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.
+# or in the "license" file accompanying this file. This file 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.
 
 source 'https://rubygems.org'
 

data/LICENSE.txt

@@ -1,40 +1,201 @@
-
-Amazon Software License
-
-This Amazon Software License (“License”) governs your use, reproduction, and distribution of the accompanying software as specified below.
-1. Definitions
-
-“Licensor” means any person or entity that distributes its Work.
-
-“Software” means the original work of authorship made available under this License.
-
-“Work” means the Software and any additions to or derivative works of the Software that are made available under this License.
-
-The terms “reproduce,” “reproduction,” “derivative works,” and “distribution” have the meaning as provided under U.S. copyright law; provided, however, that for the purposes of this License, derivative works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work.
-
-Works, including the Software, are “made available” under this License by including in or with the Work either (a) a copyright notice referencing the applicability of this License to the Work, or (b) a copy of this License.
-2. License Grants
-
-2.1 Copyright Grant. Subject to the terms and conditions of this License, each Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free, copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense and distribute its Work and any resulting derivative works in any form.
-
-2.2 Patent Grant. Subject to the terms and conditions of this License, each Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free patent license to make, have made, use, sell, offer for sale, import, and otherwise transfer its Work, in whole or in part. The foregoing license applies only to the patent claims licensable by Licensor that would be infringed by Licensor’s Work (or portion thereof) individually and excluding any combinations with any other materials or technology.
-3. Limitations
-
-3.1 Redistribution. You may reproduce or distribute the Work only if (a) you do so under this License, (b) you include a complete copy of this License with your distribution, and (c) you retain without modification any copyright, patent, trademark, or attribution notices that are present in the Work.
-
-3.2 Derivative Works. You may specify that additional or different terms apply to the use, reproduction, and distribution of your derivative works of the Work (“Your Terms”) only if (a) Your Terms provide that the use limitation in Section 3.3 applies to your derivative works, and (b) you identify the specific derivative works that are subject to Your Terms. Notwithstanding Your Terms, this License (including the redistribution requirements in Section 3.1) will continue to apply to the Work itself.
-
-3.3 Use Limitation. The Work and any derivative works thereof only may be used or intended for use with the web services, computing platforms or applications provided by Amazon.com, Inc. or its affiliates, including Amazon Web Services, Inc.
-
-3.4 Patent Claims. If you bring or threaten to bring a patent claim against any Licensor (including any claim, cross-claim or counterclaim in a lawsuit) to enforce any patents that you allege are infringed by any Work, then your rights under this License from such Licensor (including the grants in Sections 2.1 and 2.2) will terminate immediately.
-
-3.5 Trademarks. This License does not grant any rights to use any Licensor’s or its affiliates’ names, logos, or trademarks, except as necessary to reproduce the notices described in this License.
-
-3.6 Termination. If you violate any term of this License, then your rights under this License (including the grants in Sections 2.1 and 2.2) will terminate immediately.
-4. Disclaimer of Warranty.
-
-THE WORK IS PROVIDED “AS IS” WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WARRANTIES OR CONDITIONS OF M ERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT. YOU BEAR THE RISK OF UNDERTAKING ANY ACTIVITIES UNDER THIS LICENSE. SOME STATES’ CONSUMER LAWS DO NOT ALLOW EXCLUSION OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO YOU.
-5. Limitation of Liability.
-
-EXCEPT AS PROHIBITED BY APPLICABLE LAW, IN NO EVENT AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE SHALL ANY LICENSOR BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATED TO THIS LICENSE, THE USE OR INABILITY TO USE THE WORK (INCLUDING BUT NOT LIMITED TO LOSS OF GOODWILL, BUSINESS INTERRUPTION, LOST PROFITS OR DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY OTHER COMM ERCIAL DAMAGES OR LOSSES), EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

data/Makefile

@@ -1,49 +1,42 @@
 #
-#  Copyright 2014-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2014-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-#  Licensed under the Amazon Software License (the "License").
-#  You may not use this file except in compliance with the License.
-#  A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
 #
-#  http://aws.amazon.com/asl/
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-#  or in the "license" file accompanying this file. This file 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.
+# or in the "license" file accompanying this file. This file 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.
 
-.PHONY: copyright test install benchmark benchmark-streams benchmark-producer hello $(wildcard test/test_*.rb) $(wildcard test/**/test_*.rb)
+.PHONY: run run-v0.12 test test-v.012 install $(wildcard test/test_*.rb) $(wildcard test/**/test_*.rb) benchmark benchmark-remote
 
 all:
 	bundle install
-	bundle exec rake binaries
+
+run:
+	bundle exec fluentd -v
+
+run-v0.12:
+	BUNDLE_GEMFILE=./gemfiles/Gemfile.fluentd-0.12 bundle exec fluentd -v
 
 test:
 	bundle exec rake test
 
+test-v.012:
+	BUNDLE_GEMFILE=./gemfiles/Gemfile.fluentd-0.12 bundle exec rake test
+
 install:
 	bundle exec rake install:local
 
-benchmark: benchmark-streams benchmark-producer
-
-benchmark-streams:
-	bundle exec rake benchmark TYPE=streams
-
-benchmark-producer:
-	bundle exec rake benchmark TYPE=producer
-
-hello:
-	echo Hello World | bundle exec fluent-cat --none dummy
-
 $(wildcard test/test_*.rb) $(wildcard test/**/test_*.rb):
 	bundle exec rake test TEST=$@
 
-copyright:
-	find . \( -name 'Gemfile*' \
-              -or -name 'Makefile' \
-	      -or -name 'NOTICE.txt' \
-	      -or -name 'Rakefile' \
-	      -or -name 'fluent-plugin-kinesis.gemspec' \
-	      -or -name '*.rake' \
-	      -or -name '*.rb' \
-	\) -exec sed -i '' -e 's/Copyright 2014-2017/Copyright 2014-2017/' {} \;
+benchmark:
+	bundle exec rake benchmark:local
+
+benchmark-remote:
+	bundle exec rake benchmark:remote

data/README.md

@@ -1,23 +1,16 @@
 # Fluent plugin for Amazon Kinesis
 
-[![Build Status](https://travis-ci.org/awslabs/aws-fluent-plugin-kinesis.svg?branch=master)](https://travis-ci.org/awslabs/aws-fluent-plugin-kinesis)
+[![Gitter](https://badges.gitter.im/awslabs/aws-fluent-plugin-kinesis.svg)](https://gitter.im/awslabs/aws-fluent-plugin-kinesis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/awslabs/aws-fluent-plugin-kinesis.svg?branch=master)](https://travis-ci.org/awslabs/aws-fluent-plugin-kinesis)
 
 [Fluentd][fluentd] output plugin
-that sends events to [Amazon Kinesis Streams][streams] (via both API and [Kinesis Producer Library (KPL)][producer]) and [Amazon Kinesis Firehose][firehose] (via API). This gem includes three output plugins respectively:
+that sends events to [Amazon Kinesis Streams][streams] and [Amazon Kinesis Firehose][firehose]. Also it supports [KPL Aggregated record format][kpl]. This gem includes three output plugins respectively:
 
 - `kinesis_streams`
-- `kinesis_producer`
 - `kinesis_firehose`
+- `kinesis_streams_aggregated`
 
 Also, there is a [documentation on Fluentd official site][fluentd-doc-kinesis].
 
-## Warning: `kinesis` is no longer supported
-As of v1.0.0, `kinesis` plugin is no longer supported. Still you can use the plugin, but if you see the warn log below, please consider to use `kinesis_streams`.
-
-    [warn]: Deprecated warning: out_kinesis is no longer supported after v1.0.0. Please check out_kinesis_streams out.
-
-If you still want to use `kinesis`, please see [the old README][old-readme].
-
 ## Installation
 This fluentd plugin is available as the `fluent-plugin-kinesis` gem from RubyGems.
 
@@ -53,8 +46,8 @@ Or just download specify your Ruby library path. Below is the sample for specify
     export RUBYLIB=$RUBYLIB:/path/to/aws-fluent-plugin-kinesis/lib
 
 ## Dependencies
- * Ruby 2.0.0+
- * Fluentd 0.10.58+
+ * Ruby 2.1.0+
+ * Fluentd 0.12.35+
 
 ## Basic Usage
 Here are general procedures for using this plugin:
@@ -87,15 +80,6 @@ Assume you use Amazon EC2 instances with Instance profile. If you want to use sp
     </match>
 For more detail, see [Configuration: kinesis_streams](#configuration-kinesis_streams)
 
-### kinesis_producer
-    <match your_tag>
-      @type kinesis_producer
-      region us-east-1
-      stream_name your_stream
-      partition_key key  # Otherwise, use random partition key
-    </match>
-For more detail, see [Configuration: kinesis_producer](#configuration-kinesis_producer)
-
 ### kinesis_firehose
     <match your_tag>
       @type kinesis_firehose
@@ -104,6 +88,16 @@ For more detail, see [Configuration: kinesis_producer](#configuration-kinesis_pr
     </match>
 For more detail, see [Configuration: kinesis_firehose](#configuration-kinesis_firehose)
 
+### kinesis_streams_aggregated
+    <match your_tag>
+      @type kinesis_streams_aggregated
+      region us-east-1
+      stream_name your_stream
+      # Unlike kinesis_streams, there is no way to use dynamic partition key.
+      # fixed_partition_key or random.
+    </match>
+For more detail, see [Configuration: kinesis_streams_aggregated](#configuration-kinesis_streams_aggregated)
+
 ### For better throughput
 Add configuration like below:
 
@@ -116,346 +110,241 @@ Add configuration like below:
 Note: Each value should be adjusted to your system by yourself.
 
 ## Configuration: Credentials
-To put records into Amazon Kinesis Streams or Firehose, you need to provide AWS security credentials.
+To put records into Amazon Kinesis Streams or Firehose, you need to provide AWS security credentials somehow. Without specifiying credentials in config file, this plugin automatically fetch credential just following AWS SDK for Ruby does (environment variable, shared profile, and instance profile).
 
-The credential provider will be choosen by the steps below:
+This plugin uses the same configuration in [fluent-plugin-s3][fluent-plugin-s3].
 
-- Use [**shared_credentials**](#shared_credentials) section if you set it
-- Use [**assume_role_credentials**](#assume_role_credentials) section if you set it
-- Otherwise, default provider chain:
-    - [**aws_key_id**](#aws_key_id) and [**aws_sec_key**](#aws_sec_key)
-    - Environment variables (ex. `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, etc.)
-    - Default shared credentials (`default` in `~/.aws/credentials`)
-    - Instance profile (For Amazon EC2)
+**aws_key_id**
 
-### aws_key_id
-AWS access key id.
+AWS access key id. This parameter is required when your agent is not
+running on EC2 instance with an IAM Role. When using an IAM role, make 
+sure to configure `instance_profile_credentials`. Usage can be found below.
 
-### aws_sec_key
-AWS secret access key.
-
-### shared_credentials
-Use this config section to specify shared credential file path and profile name. If you want to use default profile (`default` in `~/.aws/credentials`), you don't have to specify here. For example, you can specify the config like below:
+**aws_sec_key**
 
-      <shared_credentials>
-        profile_name "your_profile_name"
-      </shared_credentials>
+AWS secret key. This parameter is required when your agent is not running
+on EC2 instance with an IAM Role.
 
-#### profile_name
-Profile name of the credential file.
+**aws_iam_retries**
 
-#### path
-Path for the credential file.
+The number of attempts to make (with exponential backoff) when loading
+instance profile credentials from the EC2 metadata service using an IAM
+role. Defaults to 5 retries.
 
 ### assume_role_credentials
-Use this config section for cross account access. For example, you can specify the config like below:
+Typically, you use AssumeRole for cross-account access or federation.
+
+    <match *>
+      @type kinesis_streams
 
       <assume_role_credentials>
-        role_arn "your_role_arn_in_cross_account_to_assume"
+        role_arn          ROLE_ARN
+        role_session_name ROLE_SESSION_NAME
       </assume_role_credentials>
-
-#### role_arn
-IAM Role to be assumed with [AssumeRole][assume_role].
-
-#### external_id
-A unique identifier that is used by third parties when [assuming roles][assmue_role] in their customers' accounts. Use this option with `role_arn` for third party cross account access. For detail, please see [How to Use an External ID When Granting Access to Your AWS Resources to a Third Party][external_id].
-
-## Configuraion: Format
-This plugin use `Fluent::TextFormatter` to serialize record to string. For more detail, see [formatter.rb]. Also, this plugin includes `Fluent::SetTimeKeyMixin` and `Fluent::SetTagKeyMixin` to use **include_time_key** and **include_tagkey**.
-
-### formatter
-Default `json`.
-
-### include_time_key
-Defalut `false`. If you want to include `time` field in your record, set `true`.
-
-### include_tag_key
-Defalut `false`. If you want to include `tag` field in your record, set `true`.
-
-### data_key
-If your record contains a field whose string should be sent to Amazon Kinesis directly (without formatter), use this parameter to specify the field. In that case, other fileds than **data_key** are thrown away and never sent to Amazon Kinesis. Default `nil`, which means whole record will be formatted and sent.
-
-### log_truncate_max_size
-Integer, default 0. When emitting the log entry, the message will be truncated by this size to avoid infinite loop when the log is also sent to Kinesis. The value 0 (default) means no truncation.
-
-### reduce_max_size_error_message
-Boolean, default false. When each record exceeds the maximum size, the original record is put on its error message. If this parameter is turned on, the error message will contain only summarized data to prevent large traffic generated by the error message.
-
-## Configuration: kinesis_streams
-Here are `kinesis_streams` specific configurations.
-
-### stream_name
-Name of the stream to put data.
-
-### region
-AWS region of your stream. It should be in form like `us-east-1`, `us-west-2`. Refer to [Regions and Endpoints in AWS General Reference][region] for supported regions.
-
-Default `nil`, which means try to find from environment variable `AWS_REGION`.
-
-### partition_key
-A key to extract partition key from JSON object. Default `nil`, which means partition key will be generated randomly.
-
-### retries_on_batch_request
-Integer, default is 3. The plugin will put multiple records to Amazon Kinesis Streams in batches using PutRecords. A set of records in a batch may fail for reasons documented in the Kinesis Service API Reference for PutRecords. Failed records will be retried **retries_on_batch_request** times. If a record fails all retries an error log will be emitted.
-
-### reset_backoff_if_success
-Boolean, default `true`. If enabled, when after retrying, the next retrying checks the number of succeeded records on the former batch request and reset exponential backoff if there is any success. Because batch request could be composed by requests across shards, simple exponential backoff for the batch request wouldn't work some cases.
-
-### batch_request_max_count
-Integer, default 500. The number of max count of making batch request from record chunk. It can't exceed the default value because it's API limit.
-
-### batch_request_max_size
-Integer, default 5 * 1024 * 1024. The number of max size of making batch request from record chunk. It can't exceed the default value because it's API limit.
-
-### http_proxy
-HTTP proxy for API calling. Default `nil`.
-
-### endpoint
-API endpoint URL, for testing. Defalut `nil`.
-
-### ssl_verify_peer
-Boolean. Disable if you want to verify ssl conncetion, for testing. Default `true`.
-
-### debug
-Boolean. Enable if you need to debug Amazon Kinesis Firehose API call. Default is `false`.
-
-## Configuration: kinesis_producer
-Here are `kinesis_producer` specific configurations.
-
-### stream_name
-Name of the stream to put data.
-
-### region
-AWS region of your stream. It should be in form like `us-east-1`, `us-west-2`. Refer to [Regions and Endpoints in AWS General Reference][region] for supported regions.
-
-Default `nil`, which means try to find from environment variable `AWS_REGION`. If both **region** and `AWS_REGION` are not defined, KPL will try to find region from Amazon EC2 metadata.
-
-### partition_key
-A key to extract partition key from JSON object. Default `nil`, which means partition key will be generated randomly.
-
-### debug
-Boolean. Enable if you need to debug Kinesis Producer Library metrics. Default is `false`.
-
-### enable_kpl_logging
-Boolean, default `false`. If you want to log KPL binary's stdout/err, make this parameter `true`.
-
-### kinesis_producer
-This section is configuration for Kinesis Producer Library. Almost all of description comes from [deault_config.propertites of KPL Java Sample Application][default_config.properties]. You should specify configurations below inside `<kinesis_producer>` section like:
-
-    <match your_tag>
-      @type kinesis_producer
-      region us-east-1
-      stream_name your_stream
-      <kinesis_producer>
-        record_max_buffered_time 10
-      </kinesis_producer>
     </match>
 
-#### aggregation_enabled
-Enable aggregation. With aggregation, multiple user records are packed into a single KinesisRecord. If disabled, each user record is sent in its own KinesisRecord.
-
-If your records are small, enabling aggregation will allow you to put many more records than you would otherwise be able to for a shard before getting throttled.
+See also:
 
-Default: `true`
+*   [Using IAM Roles - AWS Identity and Access
+    Management](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html)
+*   [Aws::STS::Client](http://docs.aws.amazon.com/sdkforruby/api/Aws/STS/Client.html)
+*   [Aws::AssumeRoleCredentials](http://docs.aws.amazon.com/sdkforruby/api/Aws/AssumeRoleCredentials.html)
 
-#### aggregation_max_count
-Maximum number of items to pack into an aggregated record.
+**role_arn (required)**
 
-There should be normally no need to adjust this. If you want to limit the time records spend buffering, look into record_max_buffered_time instead.
+The Amazon Resource Name (ARN) of the role to assume.
 
-Default: 4294967295
-Minimum: 1
-Maximum (inclusive): 9223372036854775807
+**role_session_name (required)**
 
-#### aggregation_max_size
-Maximum number of bytes to pack into an aggregated Kinesis record.
+An identifier for the assumed role session.
 
-There should be normally no need to adjust this. If you want to limit the time records spend buffering, look into [**record_max_buffered_time**](#record_max_buffered_time) instead.
+**policy**
 
-If a record has more data by itself than this limit, it will bypass the aggregator. Note the backend enforces a limit of 50KB on record size. If you set this beyond 50KB, oversize records will be rejected at the backend.
+An IAM policy in JSON format.
 
-Default: 51200
-Minimum: 64
-Maximum (inclusive): 1048576
+**duration_seconds**
 
-#### collection_max_count
-Maximum number of items to pack into an PutRecords request.
+The duration, in seconds, of the role session. The value can range from
+900 seconds (15 minutes) to 3600 seconds (1 hour). By default, the value
+is set to 3600 seconds.
 
-There should be normally no need to adjust this. If you want to limit the time records spend buffering, look into [**record_max_buffered_time**](#record_max_buffered_time) instead.
+**external_id**
 
-Default: 500
-Minimum: 1
-Maximum (inclusive): 500
+A unique identifier that is used by third parties when assuming roles in
+their customers' accounts.
 
-#### collection_max_size
-Maximum amount of data to send with a PutRecords request.
+### instance_profile_credentials
 
-There should be normally no need to adjust this. If you want to limit the time records spend buffering, look into [**record_max_buffered_time**](#record_max_buffered_time) instead.
+Retrieve temporary security credentials via HTTP request. This is useful on
+EC2 instance.
 
-Records larger than the limit will still be sent, but will not be grouped with others.
-
-Default: 5242880
-Minimum: 52224
-Maximum (inclusive): 9223372036854775807
-
-#### connect_timeout
-Timeout (milliseconds) for establishing TLS connections.
-
-Default: 6000
-Minimum: 100
-Maximum (inclusive): 300000
+    <match *>
+      @type kinesis_streams
 
-#### custom_endpoint
-Use a custom Kinesis and CloudWatch endpoint.
+      <instance_profile_credentials>
+        ip_address IP_ADDRESS
+        port       PORT
+      </instance_profile_credentials>
+    </match>
 
-Mostly for testing use. Note this does not accept protocols or paths, only host names or ip addresses. There is no way to disable TLS. The KPL always connects with TLS.
+See also:
 
-Expected pattern: `^([A-Za-z0-9-\\.]+)?$`
+*   [Aws::InstanceProfileCredentials](http://docs.aws.amazon.com/sdkforruby/api/Aws/InstanceProfileCredentials.html)
+*   [Temporary Security Credentials - AWS Identity and Access
+    Management](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html)
+*   [Instance Metadata and User Data - Amazon Elastic Compute
+    Cloud](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html)
 
-#### fail_if_throttled
-If `true`, throttled puts are not retried. The records that got throttled will be failed immediately upon receiving the throttling error. This is useful if you want to react immediately to any throttling without waiting for the KPL to retry. For example, you can use a different hash key to send the throttled record to a backup shard.
+**retries**
 
-If `false`, the KPL will automatically retry throttled puts. The KPL performs backoff for shards that it has received throttling errors from, and will avoid flooding them with retries. Note that records may fail from expiration (see [**record_ttl**](#record_ttl)) if they get delayed for too long because of
-throttling.
+Number of times to retry when retrieving credentials. Default is 5.
 
-Default: `false`
+**ip_address**
 
-#### log_level
-Minimum level of logs. Messages below the specified level will not be logged. Logs for the native KPL daemon show up on stderr.
+Default is 169.254.169.254.
 
-Default: `info`
-Expected pattern: `info|warning|error`
+**port**
 
-#### max_connections
-Maximum number of connections to open to the backend. HTTP requests are sent in parallel over multiple connections.
+Default is 80.
 
-Setting this too high may impact latency and consume additional resources without increasing throughput.
+**http_open_timeout**
 
-Default: 4
-Minimum: 1
-Maximum (inclusive): 128
+Default is 5.
 
-#### metrics_granularity
-Controls the granularity of metrics that are uploaded to CloudWatch. Greater granularity produces more metrics.
+**http_read_timeout**
 
-When `shard` is selected, metrics are emitted with the stream name and shard id as dimensions. On top of this, the same metric is also emitted with only the stream name dimension, and lastly, without the stream name. This means for a particular metric, 2 streams with 2 shards (each) will produce 7 CloudWatch metrics, one for each shard, one for each stream, and one overall, all describing the same statistics, but at different levels of granularity.
+Default is 5.
 
-When `stream` is selected, per shard metrics are not uploaded; when `global` is selected, only the total aggregate for all streams and all shards are uploaded.
+### shared_credentials
 
-Consider reducing the granularity if you're not interested in shard-level metrics, or if you have a large number of shards.
+This loads AWS access credentials from local ini file. This is useful for
+local developing.
 
-If you only have 1 stream, select `global`; the global data will be equivalent to that for the stream.
+    <match *>
+      @type kinesis_streams
 
-Refer to the metrics documentation for details about each metric.
+      <shared_credentials>
+        path         PATH
+        profile_name PROFILE_NAME
+      </shared_credentials>
+    </match>
 
-Default: `shard`
-Expected pattern: `global|stream|shard`
+See also:
 
-#### metrics_level
-Controls the number of metrics that are uploaded to CloudWatch.
+*   [Aws::SharedCredentials](http://docs.aws.amazon.com/sdkforruby/api/Aws/SharedCredentials.html)
 
-`none` disables all metrics.
+**path**
 
-`summary` enables the following metrics: UserRecordsPut, KinesisRecordsPut, ErrorsByCode, AllErrors, BufferingTime.
+Path to the shared file. Defaults to "#{Dir.home}/.aws/credentials".
 
-`detailed` enables all remaining metrics.
+**profile_name**
 
-Refer to the metrics documentation for details about each metric.
+Defaults to 'default' or `[ENV]('AWS_PROFILE')`.
 
-Default: `detailed`
-Expected pattern: `none|summary|detailed`
+## Configuraion: Format
 
-#### metrics_namespace
-The namespace to upload metrics under.
+### format (section)
+This plugin use `Fluent::TextFormatter` to serialize record to string. For more detail, see [formatter.rb]. By default, it uses `json` formatter same as specific like below:
 
-If you have multiple applications running the KPL under the same AWS account, you should use a different namespace for each application.
+    <match *>
+      @type kinesis_streams
 
-If you are also using the KCL, you may wish to use the application name you have configured for the KCL as the the namespace here. This way both your KPL and KCL metrics show up under the same namespace.
+      <format>
+        @type json
+      </format>
+    </match>
 
-Default: `KinesisProducerLibrary`
-Expected pattern: `(?!AWS/).{1,255}`
+### inject (section)
+This plugin use `Fluent::TimeFormatter` and other injection configurations. For more detail, see [inject.rb]. This section only works with Fluentd v0.14.
 
-#### metrics_upload_delay
-Delay (in milliseconds) between each metrics upload.
+For example, the config below will add `time` field whose value is eventtime with nanosecond and `tag` field whose value is its tag. (Mostly same as `include_time key true` and `include_tag_key true`)
 
-For testing only. There is no benefit in setting this lower or higher in production.
+    <match *>
+      @type kinesis_streams
 
-Default: 60000
-Minimum: 1
-Maximum (inclusive): 60000
+      <inject>
+        time_key time
+        tag_key tag
+      </inject>
+    </match>
 
-#### min_connections
-Minimum number of connections to keep open to the backend.
+By default, `time_type string` and `time_format %Y-%m-%dT%H:%M:%S.%N%z` are already set to be applicable to Elasticsearch subsecond format. Although, you can use any configuration.
 
-There should be no need to increase this in general.
+Also, there are some format related options below:
 
-Default: 1
-Minimum: 1
-Maximum (inclusive): 16
+### include_time_key
+**Notice** With Fluentd v0.14, you should use inject section.
 
-#### port
-Server port to connect to. Only useful with [**custom_endpoint**](#custom_endpoint).
+Defalut `false`. If you want to include `time` field in your record, set `true`.
 
-Default: 443
-Minimum: 1
-Maximum (inclusive): 65535
+### include_tag_key
+**Notice** With Fluentd v0.14, you should use inject section.
 
-#### rate_limit
-Limits the maximum allowed put rate for a shard, as a percentage of the backend limits.
+Defalut `false`. If you want to include `tag` field in your record, set `true`.
 
-The rate limit prevents the producer from sending data too fast to a shard. Such a limit is useful for reducing bandwidth and CPU cycle wastage from sending requests that we know are going to fail from throttling.
+### data_key
+If your record contains a field whose string should be sent to Amazon Kinesis directly (without formatter), use this parameter to specify the field. In that case, other fileds than **data_key** are thrown away and never sent to Amazon Kinesis. Default `nil`, which means whole record will be formatted and sent.
 
-Kinesis enforces limits on both the number of records and number of bytes per second. This setting applies to both.
+### compression
+Specifing compression way for data of each record. Current accepted options are `zlib`. Otherwise, no compression will be preformed.
 
-The default value of 150% is chosen to allow a single producer instance to completely saturate the allowance for a shard. This is an aggressive setting. If you prefer to reduce throttling errors rather than completely saturate the shard, consider reducing this setting.
+### log_truncate_max_size
+Integer, default 1024. When emitting the log entry, the message will be truncated by this size to avoid infinite loop when the log is also sent to Kinesis. The value 0 means no truncation.
 
-Default: 150
-Minimum: 1
-Maximum (inclusive): 9223372036854775807
+## Configuraion: API
+### region
+AWS region of your stream. It should be in form like `us-east-1`, `us-west-2`. Refer to [Regions and Endpoints in AWS General Reference][region] for supported regions.
 
-#### record_max_buffered_time
-Maximum amount of time (milliseconds) a record may spend being buffered before it gets sent. Records may be sent sooner than this depending on the other buffering limits.
+Default `nil`, which means try to find from environment variable `AWS_REGION`.
 
-This setting provides coarse ordering among records - any two records will be reordered by no more than twice this amount (assuming no failures and retries and equal network latency).
+### max_record_size
+The upper limit of size of each record. Default is 1 MB which is the limitation of Kinesis.
 
-The library makes a best effort to enforce this time, but cannot guarantee that it will be precisely met. In general, if the CPU is not overloaded, the library will meet this deadline to within 10ms.
+### http_proxy
+HTTP proxy for API calling. Default `nil`.
 
-Failures and retries can additionally increase the amount of time records spend in the KPL. If your application cannot tolerate late records, use the [**record_ttl**](#record_ttl) setting to drop records that do not get transmitted in time.
+### endpoint
+API endpoint URL, for testing. Defalut `nil`.
 
-Setting this too low can negatively impact throughput.
+### ssl_verify_peer
+Boolean. Disable if you want to verify ssl conncetion, for testing. Default `true`.
 
-Default: 100
-Maximum (inclusive): 9223372036854775807
+### debug
+Boolean. Enable if you need to debug Amazon Kinesis Firehose API call. Default is `false`.
 
-#### record_ttl
-Set a time-to-live on records (milliseconds). Records that do not get successfully put within the limit are failed.
+## Configuration: Batch request
+### retries_on_batch_request
+Integer, default is 3. The plugin will put multiple records to Amazon Kinesis Streams in batches using PutRecords. A set of records in a batch may fail for reasons documented in the Kinesis Service API Reference for PutRecords. Failed records will be retried **retries_on_batch_request** times. If a record fails all retries an error log will be emitted.
 
-This setting is useful if your application cannot or does not wish to tolerate late records. Records will still incur network latency after they leave the KPL, so take that into consideration when choosing a value for this setting.
+### reset_backoff_if_success
+Boolean, default `true`. If enabled, when after retrying, the next retrying checks the number of succeeded records on the former batch request and reset exponential backoff if there is any success. Because batch request could be composed by requests across shards, simple exponential backoff for the batch request wouldn't work some cases.
 
-If you do not wish to lose records and prefer to retry indefinitely, set record_ttl to a large value like INT_MAX. This has the potential to cause head-of-line blocking if network issues or throttling occur. You can respond to such situations by using the metrics reporting functions of the KPL. You may also set [**fail_if_throttled**](#fail_if_throttled) to true to prevent automatic retries in case of throttling.
+### batch_request_max_count
+Integer, default 500. The number of max count of making batch request from record chunk. It can't exceed the default value because it's API limit.
 
-Default: 30000
-Minimum: 100
-Maximum (inclusive): 9223372036854775807
+Default:
 
-#### request_timeout
-The maximum total time (milliseconds) elapsed between when we begin a HTTP request and receiving all of the response. If it goes over, the request will be timed-out.
+- `kinesis_streams`: 500
+- `kinesis_firehose`: 500
+- `kinesis_streams_aggregated`: 100,000
 
-Note that a timed-out request may actually succeed at the backend. Retrying then leads to duplicates. Setting the timeout too low will therefore increase the probability of duplicates.
+### batch_request_max_size
+Integer. The number of max size of making batch request from record chunk. It can't exceed the default value because it's API limit.
 
-Default: 6000
-Minimum: 100
-Maximum (inclusive): 600000
+Default:
 
-#### verify_certificate
-Verify the endpoint's certificate. Do not disable unless using [**custom_endpoint**](#custom_endpoint) for testing. Never disable this in production.
+- `kinesis_streams`: 5 MB
+- `kinesis_firehose`: 4 MB
+- `kinesis_streams_aggregated`: 1 MB
 
-Default: `true`
+## Configuration: kinesis_streams
+Here are `kinesis_streams` specific configurations.
 
-#### credentials_refresh_delay
-Interval milliseconds for refreshing credentials seding to KPL.
+### stream_name
+Name of the stream to put data.
 
-Defalut 5000
+### partition_key
+A key to extract partition key from JSON object. Default `nil`, which means partition key will be generated randomly.
 
 ## Configuration: kinesis_firehose
 Here are `kinesis_firehose` specific configurations.
@@ -463,37 +352,19 @@ Here are `kinesis_firehose` specific configurations.
 ### delivery_stream_name
 Name of the delivery stream to put data.
 
-### region
-AWS region of your stream. It should be in form like `us-east-1`, `us-west-2`. Refer to [Regions and Endpoints in AWS General Reference][region] for supported regions.
-
-Default `nil`, which means try to find from environment variable `AWS_REGION`.
-
 ### append_new_line
-Boolean. Default `true`. If it is enabled, the plugin add new line character (`\n`) to each serialized record.  
+Boolean. Default `true`. If it is enabled, the plugin add new line character (`\n`) to each serialized record.
 
-### retries_on_batch_request
-Integer, default is 3. The plugin will put multiple records to Amazon Kinesis Firehose in batches using PutRecordBatch. A set of records in a batch may fail for reasons documented in the Kinesis Service API Reference for PutRecordBatch. Failed records will be retried **retries_on_batch_request** times. If a record fails all retries an error log will be emitted.
+## Configuration: kinesis_streams_aggregated
+Here are `kinesis_streams_aggregated` specific configurations.
 
-### reset_backoff_if_success
-Boolean, default `true`. If enabled, when after retrying, the next retrying checks the number of succeeded records on the former batch request and reset exponential backoff if there is any success. Because batch request could be composed by requests across shards, simple exponential backoff for the batch request wouldn't work some cases.
-
-### batch_request_max_count
-Integer, default 500. The number of max count of making batch request from record chunk. It can't exceed the default value because it's API limit.
-
-### batch_request_max_size
-Integer, default 4 * 1024*1024. The number of max size of making batch request from record chunk. It can't exceed the default value because it's API limit.
-
-### http_proxy
-HTTP proxy for API calling. Default `nil`.
-
-### endpoint
-API endpoint URL, for testing. Defalut `nil`.
+### stream_name
+Name of the stream to put data.
 
-### ssl_verify_peer
-Boolean. Disable if you want to verify ssl conncetion, for testing. Default `true`.
+### fixed_partition_key
+A value of fixed partition key. Default `nil`, which means partition key will be generated randomly.
 
-### debug
-Boolean. Enable if you need to debug Amazon Kinesis Firehose API call. Default is `false`.
+Note: if you specified this option, all records go to a single shard.
 
 ## Development
 
@@ -501,10 +372,12 @@ To launch `fluentd` process with this plugin for development, follow the steps b
 
     git clone https://github.com/awslabs/aws-fluent-plugin-kinesis.git
     cd aws-fluent-plugin-kinesis
-    make # will install gems and download KPL jar file and extract binaries
+    make # will install gems dependency
     bundle exec fluentd -c /path/to/fluent.conf
 
-If you want to run benchmark, use `make benchmark`.
+To launch using Fluentd v0.12, use `BUNDLE_GEMFILE` environment variable:
+
+    BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.fluentd-0.12 bundle exec fluentd -c /path/to/fluent.conf
 
 ## Contributing
 
@@ -518,15 +391,13 @@ Bug reports and pull requests are welcome on [GitHub][github].
 [fluentd]: http://fluentd.org/
 [streams]: https://aws.amazon.com/kinesis/streams/
 [firehose]: https://aws.amazon.com/kinesis/firehose/
-[producer]: http://docs.aws.amazon.com/kinesis/latest/dev/developing-producers-with-kpl.html
+[kpl]: https://github.com/awslabs/amazon-kinesis-producer/blob/master/aggregation-format.md
 [td-agent]: https://github.com/treasure-data/td-agent
 [bundler]: http://bundler.io/
-[assume_role]: http://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
-[external_id]: http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html
 [region]: http://docs.aws.amazon.com/general/latest/gr/rande.html#ak_region
 [fluentd_buffer]: http://docs.fluentd.org/articles/buffer-plugin-overview
 [github]: https://github.com/awslabs/aws-fluent-plugin-kinesis
 [formatter.rb]: https://github.com/fluent/fluentd/blob/master/lib/fluent/formatter.rb
-[default_config.properties]: https://github.com/awslabs/amazon-kinesis-producer/blob/v0.10.2/java/amazon-kinesis-producer-sample/default_config.properties
-[old-readme]: https://github.com/awslabs/aws-fluent-plugin-kinesis/blob/master/README-v0.4.md
+[inject.rb]: https://github.com/fluent/fluentd/blob/master/lib/fluent/plugin_helper/inject.rb
 [fluentd-doc-kinesis]: http://docs.fluentd.org/articles/kinesis-stream
+[fluent-plugin-s3]: https://github.com/fluent/fluent-plugin-s3