fluent-plugin-kinesis 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0377336aca16e998f29f478eaf04265dd8b771
-  data.tar.gz: ec110cd43b0f3dd16f6a9f4bbadf236c97fc46e7
+  metadata.gz: 54ee01dd34cc86ac7c3ce7d16c7604a87123d7bf
+  data.tar.gz: 5f08f21e856c2bbbe6210e9aa52b8a4deae1fd1b
 SHA512:
-  metadata.gz: af17bc14e59b32a101cd0f774ae29df5213dd2b333b9af1c8c2697fc847ecbd86d8f35a6f4a4690602eb07c4184d71fa00c332002312a63ed52f81d55824e2cb
-  data.tar.gz: f6e7c4ff10c85ddc8da01456f58d8c41e1b0062d89ab102a5f5f8848cc945852dbb0b274f2402c687fa5a32ffeee3cc29e564297a8ea2e611023639e3678c40d
+  metadata.gz: 431060565257614267e8859ac87d8b97c63c883a8c2907e121c9c497c5eafc084e00bf10c8ad1349a7368561b0adff83097ed7861586130f781dec40f38bba50
+  data.tar.gz: 261dc9269325687f9dd675d592d00855c051a2023ea04fbc163a9e80ec5668ebe569d01b8000cba61f624ae0c56a3bfae6f239d4ce6f135cde0b5bbe1d6ae8d6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.1.0
+
+- Feature - Added sts_http_proxy parameter to assume_role_credentials configuration [#136](https://github.com/awslabs/aws-fluent-plugin-kinesis/pull/136)
+
 ## 2.0.1
 
 - Bug - Fix AWS SDK conflict with s3 plugin [#131](https://github.com/awslabs/aws-fluent-plugin-kinesis/pull/131)

data/README.md

@@ -104,10 +104,10 @@ For more detail, see [Configuration: kinesis_streams_aggregated](#configuration-
 Add configuration like below:
 
       flush_interval 1
-      buffer_chunk_limit 1m
-      try_flush_interval 0.1
-      queued_chunk_flush_interval 0.01
-      num_threads 15
+      chunk_limit_size 1m
+      flush_thread_interval 0.1
+      flush_thread_burst_interval 0.01
+      flush_thread_count 15
 
 Note: Each value should be adjusted to your system by yourself.
 
@@ -175,6 +175,13 @@ is set to 3600 seconds.
 A unique identifier that is used by third parties when assuming roles in
 their customers' accounts.
 
+**sts_http_proxy**
+
+Proxy url for proxying requests to amazon sts service api. This needs to be  set up independently from global http_proxy parameter
+for the use case in which requests to kinesis api are going via kinesis vpc endpoint but requests to sts api have to go via http proxy. 
+It should be added to assume_role_credentials configuration stanza in the next format:
+    sts_http_proxy http://[username:password]@hostname:port
+
 ### instance_profile_credentials
 
 Retrieve temporary security credentials via HTTP request. This is useful on

data/lib/fluent/plugin/kinesis_helper/client.rb

@@ -38,6 +38,8 @@ module Fluent
           config_param :duration_seconds, :integer, default: nil
           desc "A unique identifier that is used by third parties when assuming roles in their customers' accounts."
           config_param :external_id, :string, default: nil, secret: true
+          desc "A http proxy url for requests to aws sts service"
+          config_param :sts_http_proxy, :string, default: nil, secret: true
         end
         config_section :instance_profile_credentials, multi: false do
           desc "Number of times to retry when retrieving credentials"
@@ -129,8 +131,12 @@ module Fluent
           credentials_options[:policy] = c.policy if c.policy
           credentials_options[:duration_seconds] = c.duration_seconds if c.duration_seconds
           credentials_options[:external_id] = c.external_id if c.external_id
-          if @region
-            credentials_options[:client] = Aws::STS::Client.new(region: @region)
+          if c.sts_http_proxy and @region
+              credentials_options[:client] = Aws::STS::Client.new(region: @region, http_proxy: c.sts_http_proxy)
+          elsif @region
+              credentials_options[:client] = Aws::STS::Client.new(region: @region)
+          elsif c.sts_http_proxy
+              credentials_options[:client] = Aws::STS::Client.new(http_proxy: c.sts_http_proxy)
           end
           options[:credentials] = Aws::AssumeRoleCredentials.new(credentials_options)
         when @instance_profile_credentials

data/lib/fluent_plugin_kinesis/version.rb

@@ -13,5 +13,5 @@
 # language governing permissions and limitations under the License.
 
 module FluentPluginKinesis
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kinesis
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin that sends events to Amazon Kinesis.