fluent-plugin-grok-parser 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7652c7a0665b1f6d46aa18bd2e1b373d45facfebe5d0343ab83e34fda23b74f
-  data.tar.gz: 9a124bd9fedd164691d1eedc434d3f29dbfcddc8fe0dba94cdc5babe05185194
+  metadata.gz: bb787befdf7b8b3d1451c48cff1462e0f3ca40db0bf3c97b3a76ae112e509cdf
+  data.tar.gz: f783cd9143f07e7c5c95cc5da9aeb3a80c20549befa29ca8bcc7814b31fde0ee
 SHA512:
-  metadata.gz: 60b36ca6f266b804b95f2e325c16a3e2ff003d75f5b49826b5bb12fc4160b32dccf7b540b9741b5a9a58a8996afbb7dcdad3d66679369ba254a27a8e4e73a6bc
-  data.tar.gz: c45fa99fcb9cd319b6d9d7956d7db94a0c2f40ed8e0919d7807cec51139c7fe845fdbf0c852778735ff45ed2f74bc5b78c2d59c81eef6951f4718fa38c6afc38
+  metadata.gz: 3052cb7600aeeea43ac4c2d7ccf610cfc552e8d88c5e309487d90a843a054ff57d94ae139effa2d46e343a95a095b3c18b42f9d447d4e2b8e644103fd0ad2b6f
+  data.tar.gz: 9b48ea10a3f51661f9343d691271a0ac55a5c971834033401b54ecd6a001507e414bc5240d3d5ccaf4699e8b6d410d2142c697a269abb1fd7d855fea57adfa84

data/README.md

@@ -154,10 +154,10 @@ This generates following events:
   @type tail
   path /path/to/log
   tag grokked_log
-  grok_name_key grok_name
-  grok_failure_key grokfailure
   <parse>
     @type grok
+    grok_name_key grok_name
+    grok_failure_key grokfailure
     <grok>
       name apache_log
       pattern %{COMBINEDAPACHELOG}

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.2.0"
+  spec.version       = "2.3.0"
   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/grok.rb

@@ -33,6 +33,9 @@ module Fluent
       if @plugin.respond_to?(:multiline_start_regexp) && @plugin.multiline_start_regexp
         @multiline_start_regexp = Regexp.compile(@plugin.multiline_start_regexp[1..-2])
       end
+      if @plugin.respond_to?(:keep_time_key)
+        @keep_time_key = @plugin.keep_time_key
+      end
     end
 
     def add_patterns_from_file(path)
@@ -68,7 +71,7 @@ module Fluent
       unless types.empty?
         _conf["types"] = types.map{|subname,type| "#{subname}:#{type}" }.join(",")
       end
-      _conf = _conf.merge("expression" => regexp, "multiline" => @multiline_mode)
+      _conf = _conf.merge("expression" => regexp, "multiline" => @multiline_mode, "keep_time_key" => @keep_time_key)
       config = Fluent::Config::Element.new("parse", nil, _conf, [])
       parser = Fluent::Plugin::RegexpParser.new
       parser.configure(config)

data/test/test_grok_parser.rb

@@ -301,6 +301,26 @@ class GrokParserTest < ::Test::Unit::TestCase
     end
   end
 
+  sub_test_case "keep_time_key" do
+    test "true" do
+      d = create_driver(%[
+        keep_time_key true
+        <grok>
+          pattern "%{TIMESTAMP_ISO8601:time}"
+        </grok>
+      ])
+      expected = [
+        { "time" => "2014-01-01T00:00:00+0900" }
+      ]
+      records = []
+      d.instance.parse("Some stuff at 2014-01-01T00:00:00+0900") do |time, record|
+        assert_equal(event_time("2014-01-01T00:00:00+0900"), time)
+        records << record
+      end
+      assert_equal(expected, records)
+    end
+  end
+
   private
 
   def create_driver(conf)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grok-parser
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - kiyoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler