fluent-plugin-cloudwatch-ingest 0.1.46 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f5fd91695ebc14cb8b5a649a9a1fd6085742f4d
-  data.tar.gz: 96c8874ea1660e4f23640aa664d2d144a8067fd0
+  metadata.gz: 2346a1b86d48a04d2699c8545dff0ced90e9dbd1
+  data.tar.gz: 41936ce91915b943a539254b09a8d741bc2a86f4
 SHA512:
-  metadata.gz: 8572bc3c6dc6dcd6ac245a40d5a709ffd32932fc07cccd880be3402e59256e1b4bbeccccf21d8a613d9d8489f3894b43572243a6a283905ed59b7b0ca958e905
-  data.tar.gz: 156923cc879d36be12f951fae790dff4e6a47bc3f6945a302354570c6f850c2461b4c625d46ebb37bf6a3c2a63491b1561d8a6ac11f6bd2508c5a09e1b64fa28
+  metadata.gz: 400d18264d1a31027680d9349210d8542b89a8c18afd4dcc2d653415fc79fd512b98eeea7a77c8b910b2aeab94c30abc4d7a76c658489c093dc77c98cb35ef0c
+  data.tar.gz: c7b81e7ca951b2c7fda0ae4fecd98e9203dd85699a40786a6c67031c20e4d640a1e83051494a1dba2ffa8f87b2098a259d40fe632f8b6746ad267b358e292040

data/README.md

@@ -44,7 +44,10 @@ Or install it yourself as:
   <parse>
     @type cloudwatch_ingest
     expression /^(?<message>.+)$/
-    event_time true  # Take time from the Cloudwatch event, rather than parse it from the body
+    time_format %Y-%m-%d %H:%M:%S.%L
+    event_time true         # take time from the Cloudwatch event, rather than parse it from the body
+    inject_group_name true  # inject the group name into the record
+    inject_stream_name true # inject the stream name into the record
   </parse>
 </source>
 ```

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

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

data/lib/fluent/plugin/in_cloudwatch_ingest.rb

@@ -34,9 +34,16 @@ 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
-      config_set_default :time_format, '%Y-%m-%d %H:%M:%S.%L'
+      desc 'Regular expression with which to parse the event message'
+      config_param :expression, :string, default: '^(?<message>.+)$'
+      desc 'Take the timestamp from the event rather than the expression'
+      config_param :event_time, :bool, default: true
+      desc 'Time format to use when parsing event message'
+      config_param :time_format, :string, default: '%Y-%m-%d %H:%M:%S.%L'
+      desc 'Inject the log group name into the record'
+      config_param :inject_group_name, :bool, default: true
+      desc 'Inject the log stream name into the record'
+      config_param :inject_stream_name, :bool, default: true
     end
 
     def initialize
@@ -94,8 +101,8 @@ module Fluent::Plugin
 
     private
 
-    def emit(event)
-      @parser.parse(event) do |time, record|
+    def emit(event, log_group_name, log_stream_name)
+      @parser.parse(event, log_group_name, log_stream_name) do |time, record|
         router.emit(@tag, time, record)
       end
     end
@@ -200,7 +207,7 @@ module Fluent::Plugin
 
               response.events.each do |e|
                 begin
-                  emit(e)
+                  emit(e, group, stream)
                 rescue => boom
                   log.error("Failed to emit event #{e}: #{boom}")
                 end

data/lib/fluent/plugin/parser_cloudwatch_ingest.rb

@@ -6,9 +6,11 @@ module Fluent
     class CloudwatchIngestParser < RegexpParser
       Plugin.register_parser('cloudwatch_ingest', self)
 
-      config_set_default :expression, '^(?<message>.+)$'
-      config_set_default :time_format, '%Y-%m-%d %H:%M:%S.%L'
-      config_set_default :event_time, true
+      config_param :expression, :string, default: '^(?<message>.+)$'
+      config_param :time_format, :string, default: '%Y-%m-%d %H:%M:%S.%L'
+      config_param :event_time, :bool, default: true
+      config_param :inject_group_name, :bool, default: true
+      config_param :inject_stream_name, :bool, default: true
 
       def initiaize
         super
@@ -18,7 +20,7 @@ module Fluent
         super
       end
 
-      def parse(event)
+      def parse(event, group, stream)
         time = nil
         record = nil
         super(event.message) do |t, r|
@@ -26,6 +28,10 @@ module Fluent
           record = r
         end
 
+        # Inject optional fields
+        record['log_group_name'] = group if @inject_group_name
+        record['log_stream_name'] = stream if @inject_stream_name
+
         # We do String processing on the event time here to
         # avoid rounding errors introduced by floating point
         # arithmetic.

metadata

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