fluent-plugin-elasticsearch 5.4.0 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fc25cc0c5f9b35ce8ab9d733cbd4d908df838540f2bc5aad0fce57267f2c6d5
-  data.tar.gz: 1179e1275edf74186b41c3ff004236a940df58b4c7214f2fe6e3a7ae3852cd81
+  metadata.gz: d654e4c24122a1f08b7440556ff43eca647e9aae360c4ebc43f4e29d7a8abfec
+  data.tar.gz: 961f8dab627d2628e854e4b6b64a30fb3719c8387dfd73a67aa6da8f059eb447
 SHA512:
-  metadata.gz: 43f42f1611c24eb8ef00c153bf8ed4acc07da4a02535f5df6eecc44d9a2d219a15de1551131e7efeb80c8b8e2c20ef203302d95a2c1fe369d3996920654ec381
-  data.tar.gz: 10de0f5a8e5c2179595a99b01a331cbc102c1d9529a59435d8f5c079236cf4132f86d05e552ae2e08e1bce88ec8eac8cd28c721c016a5cb17e13526cf5336d9e
+  metadata.gz: 78d3e7ab001e326c47a192798da97b9d44956db46869b807589818469b8c74cfc36bc936c67f2fdffed3c2f2967d4c9ede1737c8c6d774362f524861eee74186
+  data.tar.gz: 85e1144f3b227d28772cf785932a44bdf6d73307b7cc0401098acd97083b9638089d5a1e5ad2343cc9a7f64f4d93e274db99419fe07fdfe5b785176d667e6592

data/History.md

@@ -2,6 +2,12 @@
 
 ### [Unreleased]
 
+### 5.4.1
+- in\_elasticsearch: Avoid to use deprecated endpoint for clear\_scroll (#1039)
+
+### 5.4.1
+- Adjust ilm endpoint (#1036)
+
 ### 5.4.0
 - Fix support for host/hosts placeholders for ipv6 addresses (#1030)
 - Handle newer es library (#1032)

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.0'
+  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/elasticsearch_compat.rb

@@ -12,6 +12,7 @@ if Gem::Version.new(Elasticsearch::VERSION) < Gem::Version.new("8.0.0")
   begin
     require 'elasticsearch/xpack'
   rescue LoadError
+    require 'elasticsearch/api' # For elasticsearch-ruby 8 or later
   end
 end
 

data/lib/fluent/plugin/elasticsearch_index_lifecycle_management.rb

@@ -45,19 +45,19 @@ module Fluent::Plugin::ElasticsearchIndexLifecycleManagement
   end
 
   def get_ilm_policy
-    if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
-      client.ilm.get_policy
+    if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
+      client.ilm.get_lifecycle
     else
-      client.enrich.get_policy
+      client.ilm.get_policy
     end
   end
 
   def ilm_policy_exists?(policy_id)
     begin
-      if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
-        client.ilm.get_policy(policy_id: policy_id)
+      if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
+        client.ilm.get_lifecycle(policy: policy_id)
       else
-        client.enrich.get_policy(name: policy_id)
+        client.ilm.get_policy(policy_id: policy_id)
       end
       true
     rescue
@@ -67,10 +67,10 @@ module Fluent::Plugin::ElasticsearchIndexLifecycleManagement
 
   def ilm_policy_put(policy_id, policy)
     log.info("Installing ILM policy: #{policy}")
-    if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
-      client.ilm.put_policy(policy_id: policy_id, body: policy)
+    if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
+      client.ilm.put_lifecycle(policy: policy_id, body: policy)
     else
-      client.enrich.put_policy(name: policy_id, body: policy)
+      client.ilm.put_policy(policy_id: policy_id, body: policy)
     end
   end
 

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/lib/fluent/plugin/out_elasticsearch_data_stream.rb

@@ -102,8 +102,8 @@ module Fluent::Plugin
       retry_operate(@max_retry_putting_template,
                     @fail_on_putting_template_retry_exceed,
                     @catch_transport_exception_on_retry) do
-        if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-          client(host).enrich.put_policy(params.merge(name: ilm_name))
+        if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
+          client(host).ilm.put_lifecycle(params.merge(policy: ilm_name))
         else
           client(host).xpack.ilm.put_policy(params.merge(policy_id: ilm_name))
         end
@@ -159,8 +159,8 @@ module Fluent::Plugin
 
     def ilm_policy_exists?(policy_id, host = nil)
       begin
-        if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-          client(host).enrich.get_policy(name: policy_id)
+        if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
+          client(host).ilm.get_lifecycle(policy: policy_id)
         else
           client(host).ilm.get_policy(policy_id: policy_id)
         end

data/test/plugin/test_elasticsearch_index_lifecycle_management.rb

@@ -38,19 +38,15 @@ class TestElasticsearchIndexLifecycleManagement < Test::Unit::TestCase
   end
 
   def ilm_existence_endpoint(policy_id)
-    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-      "_enrich/policy/#{policy_id}"
+    if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
+      "_ilm/policy/#{policy_id}"
     else
       "_ilm/policy/%7B:policy_id=%3E%22#{policy_id}%22%7D"
     end
   end
 
   def ilm_creation_endpoint(policy_id)
-    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-      "_enrich/policy/#{policy_id}"
-    else
-      "_ilm/policy/#{policy_id}"
-    end
+    "_ilm/policy/#{policy_id}"
   end
 
   def stub_elastic_info(url="http://localhost:9200/", version=elasticsearch_version)

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 = [

data/test/plugin/test_out_elasticsearch.rb

@@ -524,11 +524,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
 
     def ilm_endpoint
-      if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-        '_enrich'.freeze
-      else
-        '_ilm'.freeze
-      end
+      '_ilm'.freeze
     end
 
     data("legacy_template" => [true, "_template"],
@@ -1179,11 +1175,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
 
     def ilm_endpoint
-      if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-        '_enrich'.freeze
-      else
-        '_ilm'.freeze
-      end
+      '_ilm'.freeze
     end
 
     data("legacy_template" => [true, "_template"],
@@ -2601,11 +2593,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
 
     def ilm_endpoint
-      if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-        '_enrich'.freeze
-      else
-        '_ilm'.freeze
-      end
+      '_ilm'.freeze
     end
 
     data("legacy_template" => [true, "_template"],

data/test/plugin/test_out_elasticsearch_data_stream.rb

@@ -31,11 +31,7 @@ class ElasticsearchOutputDataStreamTest < Test::Unit::TestCase
   end
 
   def ilm_endpoint
-    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
-      '_enrich'.freeze
-    else
-      '_ilm'.freeze
-    end
+    '_ilm'.freeze
   end
 
   def driver(conf='', es_version=elasticsearch_version.to_i, client_version=elasticsearch_version)

metadata

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