fluent-plugin-cloudwatch-ingest 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431d06582709fe3e19230b616ced1474b1c76db8
-  data.tar.gz: f6d27549b73357a521538c56ec08a91bc8c3ba4b
+  metadata.gz: 5f260e2f08a2cf0a309a43e176966ce597125841
+  data.tar.gz: 4af6a75a1960cd45ef6d7a3c0eadd4b67ada29e9
 SHA512:
-  metadata.gz: 7eb663133b39036021a509bd451f12c3fde68f68ad2bbf9e16acdd7dd0a3533b43e88e57925847b39174743c89edcb006b15baa655bc6afb272071513b95e3bb
-  data.tar.gz: 8889446e0a6851fddd3c6dd661797871a5030307a5fbb6cb03bfc92afbaf5600a0987f5f85de8a0d161808be59e5da57072a73bca68d259d8351bc8f15b026b7
+  metadata.gz: 2d47e72a3d722b12653a499d506e1fa80f63a3def9094005333c980146d73c1e5817ba8a51078d87675bc346793884c3c3c65f190e2ca0000832a493ee6fb798
+  data.tar.gz: e912236d8d3129c48c59c132821337dda222c42847ec298f6a53176370bcc673e37d99d49e335f60e736abada99fc7ef59f095492c17923281d14c47a80379af

data/README.md

@@ -35,6 +35,7 @@ Or install it yourself as:
   sts_enabled true
   sts_arn arn:aws:iam::123456789012:role/role_in_another_account
   sts_session_name fluentd-dev
+  aws_logging_enabled true
   log_group_name_prefix /aws/lambda
   log_stream_name_prefix 2017
   state_file_name /mnt/nfs/cloudwatch.state

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Ingest
-        VERSION = '0.1.37'.freeze
+        VERSION = '0.1.38'.freeze
       end
     end
   end

data/lib/fluent/plugin/in_cloudwatch_ingest.rb

@@ -34,6 +34,8 @@ module Fluent::Plugin
     config_param :aws_logging_enabled, :bool, default: false
     config_section :parse do
       config_set_default :@type, 'cloudwatch_ingest'
+      config_set_default :expression, '^(?<message>.+)$'
+      config_set_default :event_time, true
     end
 
     def initialize

data/lib/fluent/plugin/parser_cloudwatch_ingest.rb

@@ -8,6 +8,7 @@ module Fluent
 
       config_set_default :expression, '^(?<message>.+)$'
       config_set_default :time_format, '%Y-%m-%d %H:%M:%S.%L'
+      config_set_default :event_time, true
 
       def parse(event)
         time = nil
@@ -23,10 +24,8 @@ module Fluent
         event_s  = event.timestamp.to_s[0..9]
         event_ns = event.timestamp.to_s[10..-1].to_i * 1_000_000
 
-        # If we cannot parse the time from the message itself (either because
-        # a time field is not included in the format, or it is not matched)
-        # then we take the time from the cloudwatch event time
-        time = time ? time : Fluent::EventTime.new(event_s, event_ns)
+        time = Fluent::EventTime.new(event_s, event_ns) if @event_time
+
         yield time, record
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-ingest
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Sam Pointer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler