fluent-plugin-grok-parser 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74360bb48589acb735b21ef7fc33da8e1e8ea1d5
-  data.tar.gz: 6f0b32cff96d5f45fbea166e819132f262c204da
+  metadata.gz: 3677fbf9646ab3f74f7e182c89d65bb8e12c7912
+  data.tar.gz: b922f2cc49ad69e8c39f9c9b3948ad174a327f8e
 SHA512:
-  metadata.gz: af2ee3177353159e23af8d67561294c30b3ac97f7c99ad92e197670689a836c7b029568bf48450782536bc3f59c0a5ab59300a9e4fba11acfb2c29528a669c0c
-  data.tar.gz: 812f3f366210ceda6deec4af94c4da8cc4e401d664cacd6a6e3927b43f55ec30ce6b60be46ef7e8a035f2890c43a59f1b7e54b6492a0d8135a8eab77576368b1
+  metadata.gz: 5154e8e2ee992db507da6fc4a6dde6aa57882a6bc12e228900793921d8234d1b266c572d5897a5c13fe84b187b6cb044cafffff4c74e10b8dc6836b947db6c68
+  data.tar.gz: 34a14a13f62a00e3c6c148e9668e1a58ac77e0fce1a79f48ef94f8d7d3eb85ee95a581d130d5cdfd9790b4e14b30fe1d3efada3bd6db0f0432b03a4fce86f7bb

data/README.md

@@ -54,7 +54,7 @@ You can parse multiple line text.
   path /path/to/log
   format multiline_grok
   grok_pattern %{IP:ip_address}\n%{GREEDYDATA:message}
-  multiline_start_regex /^\s/
+  multiline_start_regexp /^\s/
   tag grokked_log
 </source>
 ```
@@ -75,7 +75,7 @@ You can use multiple grok patterns to parse your data.
 
 Fluentd accumulates data in the buffer forever to parse complete data when no pattern matches.
 
-You can use this parser without `multiline_start_regex` when you know your data structure perfectly.
+You can use this parser without `multiline_start_regexp` when you know your data structure perfectly.
 
 
 ## How to write Grok patterns

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       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["kiyoto"]
   spec.email         = ["kiyoto@treasure-data.com"]
   spec.summary       = %q{Fluentd plugin to support Logstash-inspired Grok format for parsing logs}

data/lib/fluent/plugin/grok.rb

@@ -14,13 +14,14 @@ module Fluent
          \}/x
 
     attr_reader :parsers
+    attr_reader :multiline_start_regexp
 
     def initialize(plugin, conf)
       @pattern_map = {}
       @parsers = []
       @multiline_mode = false
       @conf = conf
-      if plugin.instance_of?(Fluent::TextParser::MultilineGrokParser)
+      if plugin.respond_to?(:firstline?)
         @multiline_mode = true
       end
       if @conf['multiline_start_regexp']

data/lib/fluent/plugin/parser_multiline_grok.rb

@@ -20,7 +20,7 @@ module Fluent
       end
 
       def firstline?(text)
-        @multiline_start_regexp && !@multiline_start_regexp.match(text)
+        @multiline_start_regexp && !!@grok.multiline_start_regexp.match(text)
       end
 
       def parse(text, &block)

data/test/test_grok_parser.rb

@@ -73,8 +73,7 @@ class GrokParserTest < ::Test::Unit::TestCase
   private
 
   def internal_test_grok_pattern(grok_pattern, text, expected_time, expected_record, options = {})
-    parser = TextParser::GrokParser.new
-    parser.configure(Config::Element.new('ROOT', '', {"grok_pattern" => grok_pattern}.merge(options), []))
+    parser = Fluent::Test::ParserTestDriver.new(TextParser::GrokParser).configure({"grok_pattern" => grok_pattern}.merge(options))
 
     # for the old, return based API
     time, record = parser.parse(text)

data/test/test_multiline_grok_parser.rb

@@ -19,9 +19,9 @@ MESSAGE
       grok_pattern %{HOSTNAME:hostname} %{GREEDYDATA:message}
       multiline_start_regexp /^\s/
     ]
-    parser = create_parser(conf)
+    d = create_driver(conf)
 
-    parser.parse(text) do |time, record|
+    d.parse(text) do |time, record|
       assert_equal({ "hostname" => "host1", "message" => message }, record)
     end
   end
@@ -36,7 +36,7 @@ TEXT
     conf = %[
        grok_pattern %{HOSTNAME:hostname} %{DATA:message1}\\n %{DATA:message2}\\n %{DATA:message3}\\nend
     ]
-    parser = create_parser(conf)
+    d = create_driver(conf)
 
     expected = {
       "hostname" => "host1",
@@ -44,17 +44,25 @@ TEXT
       "message2" => "message2",
       "message3" => "message3"
     }
-    parser.parse(text) do |time, record|
+    d.parse(text) do |time, record|
       assert_equal(expected, record)
     end
   end
 
+  def test_empty_range_text_in_text
+    text = " [b-a]"
+    conf = %[
+      grok_pattern %{HOSTNAME:hostname} %{GREEDYDATA:message}
+      multiline_start_regexp /^\s/
+    ]
+    d = create_driver(conf)
+
+    assert(d.instance.firstline?(text))
+  end
+
   private
 
-  def create_parser(conf)
-    parser = TextParser::MultilineGrokParser.new
-    io = StringIO.new(conf)
-    parser.configure(Config::Parser.parse(io, "fluent.conf"))
-    parser
+  def create_driver(conf)
+    Fluent::Test::ParserTestDriver.new(TextParser::MultilineGrokParser).configure(conf)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grok-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kiyoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler