fluent-plugin-grok-parser 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d615b82eed6b2bedc84947d46ebc4bd320f6887541416f131f9676e4531679cd
-  data.tar.gz: e6e7acba01a1a100f382ba902c55a732ad7c7079bd908b5ea3c535cebd7a9c06
+  metadata.gz: 1e7ec4c148e838be151b844b699354042ac1b9cbd040361c1888225e39fb92d2
+  data.tar.gz: 1007c3a3599f680fc9d0bbde5e0d0db644538120e3a8869351ac6cf9b9aea5fc
 SHA512:
-  metadata.gz: 9454d12393f8213e7792fd8100d3c0dfd564e1cf1248ca5b23656bf7079560c8bd486a2227a8381c70dec456415737eea7ff35494030abbb182eb77293b1c50b
-  data.tar.gz: 1df8abdbebb4d7f1c0df3b9049b86edb4b4d11badf0d1e7422e6719dc154aaeb01a6e9adbd22ea38bfc7f2cd509ebb420d6727f6795b513f46778ba1454ca51d
+  metadata.gz: c0babc9c8f455afa4da5cd79b9e356f1d7dc5783f6696a367b8b8b0030cfbeb15c003a69c3d2a53d1df9345ffaff037ec7e953cf50fd1d0dc82c426467acd2a3
+  data.tar.gz: 888e6f1cc43ddaa737743bda1007c152031587a67fc27d328f4ace2c671ff71eae1d32b8c50d00b7e261ed07f470269ee8d3a5a2b8f39ccfbfc24f98404742d7

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

@@ -13,7 +13,7 @@ module Fluent
              (?<pattern>[A-z0-9]+)
              (?::(?<subname>[@\[\]A-z0-9_:.-]+?)
                   (?::(?<type>(?:string|bool|integer|float|
-                                 time(?::.+)?|
+                                 time(?::.+?)?|
                                  array(?::.)?)))?)?
            )
          \}/x

data/test/test_grok_parser.rb

@@ -359,6 +359,21 @@ class GrokParserTest < ::Test::Unit::TestCase
         assert_equal(event_time("28/Feb/2013:12:00:00 +0900", format: "%d/%b/%Y:%H:%M:%S %z"), time)
       end
     end
+
+    test "leading time type with following other type" do
+      d = create_driver(%[
+        <grok>
+          pattern \\[%{HTTPDATE:log_timestamp:time:%d/%b/%Y:%H:%M:%S %z}\\] %{GREEDYDATA:message}
+        </grok>
+      ])
+      expected_record = {
+        "log_timestamp" => event_time("03/Feb/2019:06:47:21 +0530", format: "%d/%b/%Y:%H:%M:%S %z"),
+        "message" => "Python-urllib/2.7"
+      }
+      d.instance.parse('[03/Feb/2019:06:47:21 +0530] Python-urllib/2.7') do |time, record|
+        assert_equal(expected_record, record)
+      end
+    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grok-parser
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - kiyoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to support Logstash-inspired Grok format for parsing logs