fluent-plugin-elasticsearch 5.4.1 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61bd10f31500ee04a5f1cbf8f9a25a22c8cf22feac51ce7728c1adec21f63565
-  data.tar.gz: 73f6a791314e73d4669b26105b3377ad99a90948e4f153086c0188484119f5ee
+  metadata.gz: d654e4c24122a1f08b7440556ff43eca647e9aae360c4ebc43f4e29d7a8abfec
+  data.tar.gz: 961f8dab627d2628e854e4b6b64a30fb3719c8387dfd73a67aa6da8f059eb447
 SHA512:
-  metadata.gz: 9f2ddddd3297b4c69a1499f0dcd4e3b690224523afacce1787f2490bee809ea2cc6d81cbf723fb3ce4275ca4a9ea83a1e7da908b33ff86c94fa79799fd6cabb4
-  data.tar.gz: cecb42477e365df347ebdfeded701f2faebf1084c01a76b1b4319920c241af6f785cebff47531181de8d3eeea03d50783df5c44c46202b95ef28bb42e366168d
+  metadata.gz: 78d3e7ab001e326c47a192798da97b9d44956db46869b807589818469b8c74cfc36bc936c67f2fdffed3c2f2967d4c9ede1737c8c6d774362f524861eee74186
+  data.tar.gz: 85e1144f3b227d28772cf785932a44bdf6d73307b7cc0401098acd97083b9638089d5a1e5ad2343cc9a7f64f4d93e274db99419fe07fdfe5b785176d667e6592

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 5.4.1
+- in\_elasticsearch: Avoid to use deprecated endpoint for clear\_scroll (#1039)
+
 ### 5.4.1
 - Adjust ilm endpoint (#1036)
 

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       = '5.4.1'
+  s.version       = '5.4.2'
   s.authors       = ['diogo', 'pitr', 'Hiroshi Hatake']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com', 'cosmo0920.wp@gmail.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/in_elasticsearch.rb

@@ -286,7 +286,11 @@ module Fluent::Plugin
       end
 
       router.emit_stream(@tag, es)
-      client.clear_scroll(scroll_id: scroll_id) if scroll_id
+      if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("7.0.0")
+        client.clear_scroll(body: {scroll_id: scroll_id}) if scroll_id
+      else
+        client.clear_scroll(scroll_id: scroll_id) if scroll_id
+      end
     end
 
     def process_scroll_request(scroll_id)

data/test/plugin/test_in_elasticsearch.rb

@@ -463,9 +463,14 @@ class ElasticsearchInputTest < Test::Unit::TestCase
                                   headers: {'Content-Type' => 'application/json', 'X-elastic-product' => 'Elasticsearch'}}
                                end
                              end)
-    stub_request(:delete, "http://localhost:9200/_search/scroll/WomkoUKG0QPB679Ulo6TqQgh3pIGRUmrl9qXXGK3EeiQh9rbYNasTkspZQcJ01uz").
+    if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("7.0.0")
+      stub_request(:delete, "http://localhost:9200/_search/scroll").
+        with(body: "{\"scroll_id\":\"WomkoUKG0QPB679Ulo6TqQgh3pIGRUmrl9qXXGK3EeiQh9rbYNasTkspZQcJ01uz\"}").
       to_return(status: 200, body: "", headers: {})
-
+    else
+      stub_request(:delete, "http://localhost:9200/_search/scroll/WomkoUKG0QPB679Ulo6TqQgh3pIGRUmrl9qXXGK3EeiQh9rbYNasTkspZQcJ01uz").
+        to_return(status: 200, body: "", headers: {})
+    end
     driver(CONFIG + %[size 1])
     driver.run(expect_emits: 1, timeout: 10)
     expected = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - diogo
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd