fluent-plugin-concat 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4dd0443193203c8fba9648470a1deca9cd5f66a3
-  data.tar.gz: b6a9917305e5a1bfe26a95dae7e3902743814f55
+SHA256:
+  metadata.gz: 924dbefdf8b877e70cece4be8eb1386781c5e83b673c50b79a2888661ad7b81b
+  data.tar.gz: 4f441723887e4db4af2a9c5d97003d2fa005b1675b2bd99eff2957252cb809c0
 SHA512:
-  metadata.gz: 61803699c453e5f67fb7e44b6f5b50c225319f1389f63a85e77dd63dd44f49ca4b157c93d27c6e7dfe9937f1eef6f57419d94e88969ebbb4d53f4a736819fcc2
-  data.tar.gz: 50411a7ffd2b30f774b8d0556ff5f6fe2465a3620b1ea83b0bf7544a70a80004c51a3fd44ceec2bd72a84fbfe9c84b82e99e8e7a77cf2d8fc92ebddcbf7a67e4
+  metadata.gz: '06209f9201a4fd1d77cfcf9d915bf2f61a8e41b7585616e8b26016769cf47330adcda04449b227c84b9add2e41c3ada9fb0a452a31ba8c22b9ed68b803ad001b'
+  data.tar.gz: e851318a7d25722148975290967d770f82c1ae43bb1c76ad31c6f182eda69fc465d653fb6383b937c7c453d065e0e099ab6a20f652b0f9223fa9785c12b21065

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+#### Problem
+
+...
+
+#### Steps to replicate
+
+Provide example config and message
+
+#### Expected Behavior
+
+...
+
+#### Your environment
+
+* OS version
+* paste result of ``fluentd --version`` or ``td-agent --version``
+* plugin version
+  * paste boot log of fluentd or td-agent
+  * paste result of ``fluent-gem list``, ``td-agent-gem list`` or your Gemfile.lock

data/.travis.yml

@@ -1,11 +1,20 @@
 sudo: false
 language: ruby
 
+notifications:
+  webhooks:
+    urls:
+      secure: NhOBulc3nFAnJrCr9G0/3IGd1pOb/Zk0Wyk9Jqrf7PHnI4mZOIgttGnewZx1sG96NWrs0Braue5vXwFBTrJ60J6EW3+Q33XzhaZR+Q95jEb+5vcdIP69TYs0TgOIiOouo69Y4rIE1ANYuF/1cBfCKxGulpOIKUCW5LYPkyUEwQy+7VccULctCYCha2OYHQau5SUITCQQqZMfYCvZ+9FRubhR+OiiAnwduuzixKm5b2sa2K4lCKy2vsz3JZtjvQ6/7WM5JsipErtuUY2fDlrWSr/9SehRu8LCD119FjV/HcaAffFMokX+8vJm6RLGcyx/0mAejEqaBofqf9vi1KQJKsKuEe8N9IUpoLrl36RYVfDDRNDqm0pSkrz/KaNxSSe5sDNsCFY+uEFhtiPMHJiSlyEA+BVqnUeoM9pSWp3pcTsIHAjq5VGfQ6u9IooUODCASBlOsLuPu+FYEWG3dC3oiOLEIqQ+WywJg2P7I4dJNhyivti5j61czipTGj28ReFiydp5macKabkvAFBvOW8q07QBO4cvjixhr8hiUgMEVdo5y5dqNhLvS182by3OpmtaSQfpuI8QXytiN9629lWzB7qu0Q7Pji/5wSqEuCdaEHjF5uCVYLFE2LaGJdlTLBg9n0vFfFpJXnP1q0nehq2qRs30pNcgkcCKfEIPJgFgCac=
+    on_success: change
+    on_failure: always
+    on_start: never
+
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.3
-  - 2.4.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4.3
+  - 2.5.0
 
 gemfile:
   - Gemfile

data/README.md

@@ -51,10 +51,12 @@ This is exclusive with `n_lines.`
 **multiline\_end\_regexp**
 
 The regexp to match ending of multiline.
+This is exclusive with `n_lines.`
 
-**continuous\_line_\_regexp**
+**continuous\_line\_regexp**
 
 The regexp to match continuous lines.
+This is exclusive with `n_lines.`
 
 **stream\_identity\_key**
 
@@ -125,6 +127,16 @@ Handle timeout log lines the same as normal logs.
 </label>
 ```
 
+Handle single line JSON from Docker containers.
+
+```aconf
+<filter **>
+  @type concat
+  key message
+  multiline_end_regexp /\\n$/
+</filter>
+```
+
 ## Contributing
 
 1. Fork it

data/fluent-plugin-concat.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-concat"
-  spec.version       = "2.1.0"
+  spec.version       = "2.2.0"
   spec.authors       = ["Kenji Okimoto"]
   spec.email         = ["okimoto@clear-code.com"]
 

data/lib/fluent/plugin/filter_concat.rb

@@ -40,20 +40,22 @@ module Fluent::Plugin
     def configure(conf)
       super
 
-      if @n_lines && @multiline_start_regexp
-        raise Fluent::ConfigError, "n_lines and multiline_start_regexp are exclusive"
+      if @n_lines && (@multiline_start_regexp || @multiline_end_regexp || @continuous_line_regexp)
+        raise Fluent::ConfigError, "n_lines and multiline_start_regexp/multiline_end_regexp/continuous_line_regexp are exclusive"
       end
-      if @n_lines.nil? && @multiline_start_regexp.nil?
-        raise Fluent::ConfigError, "Either n_lines or multiline_start_regexp is required"
+      if @n_lines.nil? && @multiline_start_regexp.nil? && @multiline_end_regexp.nil?
+        raise Fluent::ConfigError, "Either n_lines or multiline_start_regexp or multiline_end_regexp is required"
       end
 
       @mode = nil
       case
       when @n_lines
         @mode = :line
-      when @multiline_start_regexp
+      when @multiline_start_regexp || @multiline_end_regexp
         @mode = :regexp
-        @multiline_start_regexp = Regexp.compile(@multiline_start_regexp[1..-2])
+        if @multiline_start_regexp
+          @multiline_start_regexp = Regexp.compile(@multiline_start_regexp[1..-2])
+        end
         if @multiline_end_regexp
           @multiline_end_regexp = Regexp.compile(@multiline_end_regexp[1..-2])
         end
@@ -161,8 +163,12 @@ module Fluent::Plugin
         return new_es
       else
         if @buffer[stream_identity].empty?
-          new_es.add(time, record)
-          return new_es
+          if !@multiline_start_regexp
+            @buffer[stream_identity] << [tag, time, record]
+          else
+            new_es.add(time, record)
+            return new_es
+          end
         else
           if continuous_line?(record[@key])
             # Continuation of the previous line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-concat
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to concat multiple event messages