fluent-plugin-records-merger 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc61cda29562aa3584b286a76306f0aa056b7c03b7c2ea08873015e405dd1dd
-  data.tar.gz: 5d05ec3251915b6b4718bd1f9e63e3ef8b889c18d8c40d3439be11acbc80b584
+  metadata.gz: d2dadccfda29fd7cd20e69f57e0470b53eb045b024bd02b88121fd077093b710
+  data.tar.gz: 4ed5c0798334c3ecc646adf1ab11bd437810586c352d08b58a761ae529050be7
 SHA512:
-  metadata.gz: 52ff0bc07bae39d77757d6cd77c9ef9adf670692c53cf63740a7589e461977a606ab99828a2e37eb9f3411a346f3c572eaa011c67167dc1f3ecdbf43c2122f20
-  data.tar.gz: bd1f34ec4086088e27a5bc4314049629d75ff48674779cf616c8b1c0b74c26757de0c220035cff854feb2d797f59b14411605080faa9cc8e735408e3da1c3c18
+  metadata.gz: 71807003aef31b0dd760ed69bd57ed4741d4628817f9982bfd7627869f6575c0434e7b75fa2b714b64301c76e16cb3291f129db4ef50fa03ce7676adbe0ffeae
+  data.tar.gz: eb474e704455ffbdc46dc6d8b2a9ef9487cd637d6cb8928c281712fde4548600b3eb94dc87324587e8023fb8b5ba031de58e184d87df52c9212e5def3f96e431

data/example/fluent.conf

@@ -29,6 +29,19 @@
   </record>
 </match>
 
+<match x.**>
+  @type records_merger
+  tag result
+  merge_timing before
+  main_tag x.main
+  sub_tag1 x.sub1
+  condition sub1 != nil
+  emit_first_main true
+  <record>
+    main  ${main["word"]}
+    sub   ${sub1["word"]}
+  </record>
+</match>
 
 <match result>
   @type stdout

data/fluent-plugin-records-merger.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-records-merger'
-  spec.version = '0.1.6'
+  spec.version = '0.1.7'
   spec.authors = ['Nobuyuki Oishi', 'WallyNegima']
   spec.email   = ['u.str.gm@gmail.com']
 

data/lib/fluent/plugin/out_records_merger.rb

@@ -43,6 +43,7 @@ module Fluent
 
       config_param :condition, :string, default: nil, desc: 'emit if condition is true '
       config_param :keep_records, :bool, default: false, desc: 'keep latest records if true'
+      config_param :emit_first_main, :bool, default: false, desc: 'emit only main if true'
       # 以下、未実装
       config_param :force_emit, :bool, default: false,
                                        desc: 'Specify to emit or not when exceeded the tolerable_time_range'
@@ -90,6 +91,7 @@ module Fluent
         @hostname = Socket.gethostname
         @condition = conf['condition']
         @keep_records = conf['keep_records']
+        @emit_first_main = conf['emit_first_main']
       end
 
       def start
@@ -107,6 +109,10 @@ module Fluent
             @flags4merge[0] = 1
             check_timegap if @tolerable_time_range > 0
             emit_new_event(es) if @flags4merge.all? { |flag| flag == 1 }
+            if @emit_first_main
+              emit_new_event(es)
+              @emit_first_main = false
+            end
           elsif @sub_tags.include?(tag)
             store_to_lastrecords(tag, es)
             @flags4merge[@sub_tags.index(tag) + 1] = 1
@@ -133,6 +139,10 @@ module Fluent
             @flags4merge[0] = 1
             check_timegap if @tolerable_time_range > 0
             emit_new_event(es) if @flags4merge.all? { |flag| flag == 1 }
+            if @emit_first_main
+              emit_new_event(es)
+              @emit_first_main = false
+            end
           elsif @sub_tags.include?(tag)
             store_to_lastrecords(tag, es)
             @flags4merge[@sub_tags.index(tag) + 1] = 1
@@ -222,7 +232,8 @@ module Fluent
 
       def condition_is_ok?(placeholder_values)
         placeholders = @placeholder_expander.prepare_placeholders(placeholder_values)
-        instance_eval(@condition.gsub(/((main\["\w+"\])|(sub[0-9]{1,2}\["\w+"\]))/, 'placeholders[\'${\1}\']'))
+        pp @condition.gsub(/((main\["\w+"\])|(sub[0-9]{1,2}\["\w+"\])|(sub[0-9]{1,2})|main)/, 'placeholders[\'${\1}\']')
+        instance_eval(@condition.gsub(/((main\["\w+"\])|(sub[0-9]{1,2}\["\w+"\])|(sub[0-9]{1,2})|main)/, 'placeholders[\'${\1}\']'))
       end
 
       def check_timegap

data/release.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+git add lib/
+git add fluent-plugin-records-merger.gemspec
+git commit -m 'release commit'
+gem build fluent-plugin-records-merger.gemspec
+rake release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-records-merger
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nobuyuki Oishi
@@ -93,6 +93,7 @@ files:
 - example/word3.json
 - fluent-plugin-records-merger.gemspec
 - lib/fluent/plugin/out_records_merger.rb
+- release.sh
 - test/helper.rb
 - test/plugin/test_out_records_merger.rb
 homepage: https://github.com/WallyNegima/fluent-plugin-records-merger