fluent-plugin-cloudwatch-logs 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ac14d761ae8cfffe1fd6cc11abdc282861f8639924776117c6773a4599057a
-  data.tar.gz: 933cc8a97a346ade8287f5fbfc339aa2340a8982c3252cf822a9b95d70c0c78f
+  metadata.gz: bde5b7cd1595dd2fc007de30ed34cbd38e635f9c1532f476f7dca0cabb3af12a
+  data.tar.gz: dafcdd1336e06c808600229c56b504e0f2d4766011b34e480973a203945a4fe3
 SHA512:
-  metadata.gz: 64c6c225b57fe907a6ac9e1941d3cb3a1c0356096aeda2e9213bee288e479c18ed33d73eea754a58474d60e818f6c6ce7f33f5efa0b339c663d3a84f743d8ccf
-  data.tar.gz: 5300d8d29f83242479ac2f38c8bdf26bacd3d8dd353f8b286eb593912671ec6143ad26ff3640affbd33293ae07cea1b9bf3d22dcbe0eb81acb2ffc5564cc0aec
+  metadata.gz: d02acdf6785f10b98201d4fc886a88548c7c7468edc94c3b6d81490815955ee3e52b3c9aa2a67c4931a693bb877fa9daf8500986bf29a888573b1e6f44535786
+  data.tar.gz: 9c32ce072ea6d62a87468ed42cd90be1cee412d3a1caa7665148c7fdac3a148d0bb263295c725689b1e0a5e82ef39cd032eb8ae12d32cf3740dc59973169429b

data/README.md

@@ -4,6 +4,15 @@
 
 [CloudWatch Logs](http://aws.amazon.com/blogs/aws/cloudwatch-log-service/) Plugin for Fluentd
 
+## Requirements
+
+|fluent-plugin-cloudwatch-logs|     fluentd      |  ruby  |
+|-----------------------------|------------------|--------|
+|     >= 0.5.0                | >= 0.14.15       | >= 2.1 |
+|     <= 0.4.5                | ~> 0.12.0 *      | >= 1.9 |
+
+* May not support all future fluentd features
+
 ## Installation
 
     $ gem install fluent-plugin-cloudwatch-logs
@@ -84,6 +93,7 @@ Fetch sample log from CloudWatch Logs:
   #put_log_events_disable_retry_limit false
   #endpoint http://localhost:5000/
   #json_handler json
+  #log_rejected_request true
 </match>
 ```
 
@@ -106,6 +116,7 @@ Fetch sample log from CloudWatch Logs:
 * `put_log_events_disable_retry_limit`: if true, `put_log_events_retry_limit` will be ignored
 * `endpoint`: use this parameter to connect to the local API endpoint (for testing)
 * `json_handler`: name of the library to be used to handle JSON data. For now, supported libraries are `json` (default) and `yajl`.
+* `log_rejected_request`: output `rejected_log_events_info` request log. (defaults to false)
 
 ### in_cloudwatch_logs
 

data/lib/fluent/plugin/cloudwatch/logs/version.rb

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.7.1"
+        VERSION = "0.7.2"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -43,6 +43,7 @@ module Fluent::Plugin
     config_param :retention_in_days_key, :string, default: nil
     config_param :remove_retention_in_days, :bool, default: false
     config_param :json_handler, :enum, list: [:yajl, :json], :default => :yajl
+    config_param :log_rejected_resquest, :bool, :default => false
 
     config_section :buffer do
       config_set_default :@type, DEFAULT_BUFFER_TYPE
@@ -326,8 +327,7 @@ module Fluent::Plugin
         begin
           t = Time.now
           response = @logs.put_log_events(args)
-          log.warn response.rejected_log_events_info if response.rejected_log_events_info != nil
-          log.debug "Called PutLogEvents API", {
+          request =  {
             "group" => group_name,
             "stream" => stream_name,
             "events_count" => events.size,
@@ -336,6 +336,12 @@ module Fluent::Plugin
             "thread" => Thread.current.object_id,
             "request_sec" => Time.now - t,
           }
+          if response.rejected_log_events_info != nil && @log_rejected_request
+            log.warn response.rejected_log_events_info
+            log.warn "Called PutLogEvents API", request
+          else
+            log.debug "Called PutLogEvents API", request
+          end
         rescue Aws::CloudWatchLogs::Errors::InvalidSequenceTokenException, Aws::CloudWatchLogs::Errors::DataAlreadyAcceptedException => err
           sleep 1 # to avoid too many API calls
           log_stream = find_log_stream(group_name, stream_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -135,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: CloudWatch Logs Plugin for Fluentd