fluent-plugin-elasticsearch 1.17.2 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 331ba0c76606e47fa96214c432b7c67bdeda5440cb45c8689f9b63052f372ec1
-  data.tar.gz: 68a57f20ce85df802931dc206c52874acb8bf8d49d5d30c020f43a295a8ffe26
+  metadata.gz: 2e6b46f67805b944adff6414e59f57c384cb02d7609440773ef3ee412bd8cb46
+  data.tar.gz: c808857aae2e8566e88c211b3e03b69a7979fca4e09de569be972ba6f3210d5e
 SHA512:
-  metadata.gz: 45d64db8c27ba51856ad811ee09c509ee412bd715abfc7d63a1d0314e07d42295256e8b667df8f81ca2c48425cdc87b1a3808712493c7eb27bb0ab05d2706b3c
-  data.tar.gz: 473bc12ab5f0d3e0748f5ea0a1a419ca584a49b76df603e472411559892bf5c8d7beef25e25913270ad6dba1ac7435982955747f1bc53765c5dd6583e663bf3a
+  metadata.gz: be3a97d063b6ddbe4f4fa6cb267e7453341a31a678b8385c197ad25e5eb92dad0503ab92db0a0bdda00b41522944dfd50f11666943f5af3f76044551d423a137
+  data.tar.gz: f2ae3e1a47fc1567aa82fa79127717b53b5765b97d71cfb02564d76671ee9376ef8626c9e4bae7c8a65d68c114ecbe5436e6902d52630658dcb4ca9e08ff3396

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 1.18.0
+- Avoid NoMethodError on unknown Elasticsearch error responses (#487)
+
 ### 1.17.2
 - add simple sniffer for simple proxy/lb cases (#459)
 

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '1.17.2'
+  s.version       = '1.18.0'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/elasticsearch_error_handler.rb

@@ -63,8 +63,8 @@ class Fluent::ElasticsearchErrorHandler
         stats[:bad_argument] += 1
         @plugin.router.emit_error_event(tag, time, rawrecord, ElasticsearchError.new('400 - Rejected by Elasticsearch'))
       else
-        if item[write_operation].has_key?('error') && item[write_operation]['error'].has_key?('type')
-          type = item[write_operation]['error']['type']
+        type = item[write_operation].fetch('error', {})['type']
+        if type
           stats[type] += 1
           retry_stream.add(time, rawrecord)
         else

data/test/plugin/test_elasticsearch_error_handler.rb

@@ -195,4 +195,26 @@ class TestElasticsearchErrorHandler < Test::Unit::TestCase
 
   end
 
+  def test_old_es_1_X_responses
+    records = [{time: 123, record: {"foo" => "bar", '_id' => 'abc'}}]
+    response = parse_response(%({
+      "took" : 0,
+      "errors" : true,
+      "items" : [
+        {
+          "create" : {
+            "_index" : "foo",
+            "status" : 429,
+            "_type"  : "bar",
+            "error" : "some unrecognized error"
+          }
+        }
+      ]
+     }))
+    chunk = MockChunk.new(records)
+    @handler.handle_error(response, 'atag', chunk, records.length)
+    assert_equal(1, @plugin.error_events.size)
+    assert_true(@plugin.error_events[0][:error].respond_to?(:backtrace))
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.17.2
+  version: 1.18.0
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd