fluent-plugin-grok-parser 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c5c25e59b231fe7a4902d8e691fb1b999185faa
-  data.tar.gz: 2aa97bc6af77717e3833292b040d0669b78f07a7
+  metadata.gz: e060afabd9e4d73423021b054e7e5ee3039d3c61
+  data.tar.gz: 034f70ce29e90780e1400cceef99e7846593215d
 SHA512:
-  metadata.gz: 3f28d4fe0a807b0efde2781e5e0c086689dfa4c56b47722100b7e44088801f9ae342c2dcc7e658405fef0683f38ff8445f9ee65125ccbc3ffebfceb3fdaed74e
-  data.tar.gz: 30ab878638d27d96bfbcdba1072f7458e99210df286aca12f2aa8e9f2ed79bc17bbad04d054bb11bbca9389fb7360307aa43bf1bd304bfa7236058dd934ca58f
+  metadata.gz: 89b109daae28b9a9a353fa2f8e18c96c8bd756fef61a8f9ab80a57c2063791bbd862e880246f638dff4a5ed9c63d171280d28f604df1b49076ba82f69cddcdab
+  data.tar.gz: 53d9839896675c45ebcfbcc0ad4aa3019ac24cb06d4f80667efef2d263e51901b24ba9e3a0d43213cf98782539d912dbeba2263bc5d471f9cd2d08f410261dce

data/.travis.yml

@@ -4,5 +4,6 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
 

data/README.md

@@ -2,6 +2,14 @@
 
 This is a Fluentd plugin to enable Logstash's Grok-like parsing logic.
 
+## Requirements
+
+| fluent-plugin-grok-parser | fluentd    | ruby   |
+|---------------------------|------------|--------|
+| >= 1.0.0                  | >= v0.14.0 | >= 2.1 |
+| < 1.0.0                   | >= v0.12.0 | >= 1.9 |
+
+
 ## What's Grok?
 
 Grok is a macro to simplify and reuse regexes, originally developed by [Jordan Sissel](http://github.com/jordansissel).

data/fluent-plugin-grok-parser.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-grok-parser"
-  spec.version       = "2.1.0"
+  spec.version       = "2.1.1"
   spec.authors       = ["kiyoto", "Kenji Okimoto"]
   spec.email         = ["kiyoto@treasure-data.com", "okimoto@clear-code.com"]
   spec.summary       = %q{Fluentd plugin to support Logstash-inspired Grok format for parsing logs}

data/lib/fluent/plugin/parser_grok.rb

@@ -1,4 +1,5 @@
 require "fluent/plugin/grok"
+require "fluent/plugin/parser_none"
 
 module Fluent
   module Plugin
@@ -16,7 +17,7 @@ module Fluent
 
       def initialize
         super
-        @default_parser = NoneParser.new
+        @default_parser = Fluent::Plugin::NoneParser.new
       end
 
       def configure(conf={})

data/test/test_grok_parser_in_tcp.rb

@@ -24,43 +24,67 @@ class TcpInputWithGrokTest < Test::Unit::TestCase
   BASE_CONFIG = %[
     port #{PORT}
     tag tcp
-    format grok
   ]
   CONFIG = BASE_CONFIG + %[
     bind 127.0.0.1
+    <parse>
+      @type grok
+    </parse>
   ]
   IPv6_CONFIG = BASE_CONFIG + %[
     bind ::1
+    <parse>
+      @type grok
+    </parse>
   ]
 
   def create_driver(conf)
-    Fluent::Test::Driver::Input.new(Fluent::TcpInput).configure(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::TcpInput).configure(conf)
   end
 
-  def test_configure
-    configs = {"127.0.0.1" => CONFIG}
-    configs.merge!("::1" => IPv6_CONFIG) if ipv6_enabled?
-
-    configs.each_pair { |k, v|
-      d = create_driver(v)
-      assert_equal PORT, d.instance.port
-      assert_equal k, d.instance.bind
-      assert_equal "\n", d.instance.delimiter
-    }
+  data do
+    configs = {}
+    configs[:ipv4] = ["127.0.0.1", CONFIG]
+    configs[:ipv6] = ["::1", IPv6_CONFIG] if ipv6_enabled?
+    configs
+  end
+  def test_configure(data)
+    k, config = data
+    d = create_driver(config)
+    assert_equal PORT, d.instance.port
+    assert_equal k, d.instance.bind
+    assert_equal "\n", d.instance.delimiter
   end
 
   def test_grok_pattern
+    tests = [
+      {"msg" => "tcptest1\n", "expected" => "tcptest1"},
+      {"msg" => "tcptest2\n", "expected" => "tcptest2"},
+    ]
+    config = %[
+      <parse>
+        @type grok
+        grok_pattern %{GREEDYDATA:message}
+      </parse>
+    ]
+
+    internal_test_grok(config, tests)
+  end
+
+  def test_grok_pattern_block_config
     tests = [
       {"msg" => "tcptest1\n", "expected" => "tcptest1"},
       {"msg" => "tcptest2\n", "expected" => "tcptest2"},
     ]
     block_config = %[
-      <grok>
-        pattern %{GREEDYDATA:message}
-      </grok>
+      <parse>
+        @type grok
+        <grok>
+          pattern %{GREEDYDATA:message}
+        </grok>
+      </parse>
     ]
 
-    internal_test_grok("grok_pattern %{GREEDYDATA:message}", tests)
     internal_test_grok(block_config, tests)
   end
 
@@ -70,12 +94,15 @@ class TcpInputWithGrokTest < Test::Unit::TestCase
       {"msg" => "The first word matches\n", "expected" => "The"}
     ]
     block_config = %[
-      <grok>
-        pattern %{TIMESTAMP_ISO8601:message}
-      </grok>
-      <grok>
-        pattern %{WORD:message}
-      </grok>
+      <parse>
+        @type grok
+        <grok>
+          pattern %{TIMESTAMP_ISO8601:message}
+        </grok>
+        <grok>
+          pattern %{WORD:message}
+        </grok>
+      </parse>
     ]
     internal_test_grok(block_config, tests)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grok-parser
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - kiyoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to support Logstash-inspired Grok format for parsing logs