fluent-plugin-grok-parser 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b56a245878d9ddd1ab1c5ea39e5a92cd6b08839c
-  data.tar.gz: 820135576c4bcbf0947a65d1b69336f6d6da220f
+  metadata.gz: 81e9e7db22e4262df86b7e9fd832ba8cb9b82a5f
+  data.tar.gz: 6e7c3210287f264f86a5ee28d8e6a10b5714f41d
 SHA512:
-  metadata.gz: 6c5ac02ed48995a8ebcdb8127f1ad05347da22fb2916beeec99bb08dfae6d7eb0f5b73d625c56a4f111dc5c43ab74ca7f950719bbef8c2963f50c19d68cf6fee
-  data.tar.gz: a12c3a6695962295b8cd3f534473caba908e4fa27f3a062996995d35684bfb1d275838155e316c75a82596b66dfa653ea1efb8f192d2ea6becc55fac2df70cba
+  metadata.gz: a5523e5b7fedd8e9a1f7d07223c5b6e7a546d71fbe502132a86ca2cfb01067a63a8e8e21d7e3a16d9a08d21227c04d4a4fb2d0502ce0189fe6e49556cce63124
+  data.tar.gz: 0af251adce899635f0479411af832e3e125bdced10434d09e841b94d20b552cce2603a8106086711aa71d1aa962ff3d98cb97f5732a9600b3260054672102151

data/README.md

@@ -33,7 +33,7 @@ extracts the first IP address that matches in the log.
 </source>
 ```
 
-You can also use Fluentd v0.12 style:
+For Fluentd v0.12, use following style:
 
 ```aconf
 <source>
@@ -68,7 +68,7 @@ You can also use Fluentd v0.12 style:
 </source>
 ```
 
-You can also use Fluentd v0.12 style:
+For Fluentd v0.12, use following style:
 
 ```aconf
 <source>
@@ -106,7 +106,7 @@ You can parse multiple line text.
 </source>
 ```
 
-You can also use Fluentd v0.12 style:
+For Fluentd v0.12, use following style:
 
 ```aconf
 <source>
@@ -135,7 +135,7 @@ You can use multiple grok patterns to parse your data.
 </source>
 ```
 
-You can also use Fluentd v0.12 style:
+For Fluentd v0.12, use following style:
 
 ```aconf
 <source>
@@ -312,7 +312,7 @@ Here is a sample config using the Grok parser with `in_tail` and the `types` par
 
 If you want to use this plugin with Fluentd v0.12.x or earlier, you can use this plugin version v1.0.0.
 
-See also: [Plugin Management | Fluentd](http://docs.fluentd.org/articles/plugin-management#ldquomdashgemfilerdquo-option)
+See also: [Plugin Management | Fluentd](http://docs.fluentd.org/articles/plugin-management#plugin-version-management)
 
 ## License
 

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.2"
+  spec.version       = "2.1.3"
   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

@@ -51,6 +51,10 @@ module Fluent
           @parsers << expand_pattern_expression(grok_conf["pattern"], grok_conf)
         end
       end
+      @parsers.compact!
+      if @parsers.empty?
+        raise Fluent::ConfigError, 'no grok patterns. Check configuration, e.g. typo, configuration syntax, etc'
+      end
     end
 
     private
@@ -70,6 +74,7 @@ module Fluent
       raise e
     rescue => e
       $log.error(error: e)
+      nil
     end
 
     def expand_pattern(pattern)

data/test/test_grok_parser.rb

@@ -11,6 +11,10 @@ def str2time(str_time, format = nil)
 end
 
 class GrokParserTest < ::Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
   class Timestamp < self
     def test_timestamp_iso8601
       internal_test_grok_pattern("%{TIMESTAMP_ISO8601:time}", "Some stuff at 2014-01-01T00:00:00+0900",
@@ -157,6 +161,39 @@ class GrokParserTest < ::Test::Unit::TestCase
     end
   end
 
+  def test_no_grok_patterns
+    assert_raise Fluent::ConfigError do
+      create_driver('')
+    end
+  end
+
+  def test_invalid_config_value_type
+    assert_raise Fluent::ConfigError do
+      create_driver(%[
+        <grok>
+          pattern %{PATH:path:foo}
+        </grok>
+      ])
+    end
+  end
+
+  def test_invalid_config_value_type_and_normal_grok_pattern
+    d = create_driver(%[
+      <grok>
+        pattern %{PATH:path:foo}
+      </grok>
+      <grok>
+        pattern %{IP:ip_address}
+      </grok>
+    ])
+    assert_equal(1, d.instance.instance_variable_get(:@grok).parsers.size)
+    logs = $log.instance_variable_get(:@logger).instance_variable_get(:@logdev).logs
+    error_logs = logs.grep(/error_class/)
+    assert_equal(1, error_logs.size)
+    error_message = error_logs.first[/error="(.+)"/, 1]
+    assert_equal("unknown value conversion for key:'path', type:'foo'", error_message)
+  end
+
   private
 
   def create_driver(conf)

data/test/test_grok_parser_in_tcp.rb

@@ -29,12 +29,18 @@ class TcpInputWithGrokTest < Test::Unit::TestCase
     bind 127.0.0.1
     <parse>
       @type grok
+      <grok>
+        pattern %{GREEDYDATA:message}
+      </grok>
     </parse>
   ]
   IPv6_CONFIG = BASE_CONFIG + %[
     bind ::1
     <parse>
       @type grok
+      <grok>
+        pattern %{GREEDYDATA:message}
+      </grok>
     </parse>
   ]
 

data/test/test_multiline_grok_parser.rb

@@ -95,6 +95,12 @@ TEXT
     end
   end
 
+  def test_no_grok_patterns
+    assert_raise Fluent::ConfigError do
+      create_driver('')
+    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.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - kiyoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler