fluent-plugin-elasticsearch 5.0.0 → 5.2.3

data/test/plugin/test_out_elasticsearch.rb

@@ -10,7 +10,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   include FlexMock::TestCase
   include Fluent::Test::Helpers
 
-  attr_accessor :index_cmds, :index_command_counts
+  attr_accessor :index_cmds, :index_command_counts, :index_cmds_all_requests
 
   def setup
     Fluent::Test.setup
@@ -19,7 +19,15 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     log.out.logs.slice!(0, log.out.logs.length)
   end
 
-  def driver(conf='', es_version=5, client_version="\"5.0\"")
+  def elasticsearch_version
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("7.14.0")
+      TRANSPORT_CLASS::VERSION.split(".")[0..1].join(".")
+    else
+      "7.17".freeze
+    end
+  end
+
+  def driver(conf='', es_version=elasticsearch_version.to_i, client_version="\"#{elasticsearch_version}\"")
     # For request stub to detect compatibility.
     @es_version ||= es_version
     @client_version ||= client_version
@@ -45,6 +53,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     }.configure(conf)
   end
 
+  def elasticsearch_transport_layer_decoupling?
+    Gem::Version.create(::TRANSPORT_CLASS::VERSION) >= Gem::Version.new("7.14.0")
+  end
+
+  def elastic_transport_layer?
+    Gem::Version.create(::TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+  end
+
   def default_type_name
     Fluent::Plugin::ElasticsearchOutput::DEFAULT_TYPE_NAME
   end
@@ -59,9 +75,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     }
   end
 
-  def stub_elastic_info(url="http://localhost:9200/", version="6.4.2")
-    body ="{\"version\":{\"number\":\"#{version}\"}}"
-    stub_request(:get, url).to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'json' } })
+  def stub_elastic_info(url="http://localhost:9200/", version=elasticsearch_version)
+    body ="{\"version\":{\"number\":\"#{version}\", \"build_flavor\":\"default\"},\"tagline\" : \"You Know, for Search\"}"
+    stub_request(:get, url)
+      .to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'json', 'X-elastic-product' => 'Elasticsearch' } })
   end
 
   def stub_elastic(url="http://localhost:9200/_bulk")
@@ -70,6 +87,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
   end
 
+  def stub_elastic_all_requests(url="http://localhost:9200/_bulk")
+    @index_cmds_all_requests = Array.new
+    stub_request(:post, url).with do |req|
+      @index_cmds = req.body.split("\n").map {|r| JSON.parse(r) }
+      @index_cmds_all_requests << @index_cmds
+    end
+  end
+
   def stub_elastic_unavailable(url="http://localhost:9200/_bulk")
     stub_request(:post, url).to_return(:status => [503, "Service Unavailable"])
   end
@@ -253,7 +278,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_true instance.verify_es_version_at_startup
     assert_equal Fluent::Plugin::ElasticsearchOutput::DEFAULT_ELASTICSEARCH_VERSION, instance.default_elasticsearch_version
     assert_false instance.log_es_400_reason
-    assert_equal 20 * 1024 * 1024, Fluent::Plugin::ElasticsearchOutput::TARGET_BULK_BYTES
+    assert_equal -1, Fluent::Plugin::ElasticsearchOutput::DEFAULT_TARGET_BULK_BYTES
     assert_false instance.compression
     assert_equal :no_compression, instance.compression_level
     assert_true instance.http_backend_excon_nonblock
@@ -261,7 +286,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   end
 
   test 'configure compression' do
-    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.2.0")
+    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.2.0")
 
     config = %{
       compression_level best_compression
@@ -272,7 +297,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   end
 
   test 'check compression strategy' do
-    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.2.0")
+    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.2.0")
 
     config = %{
       compression_level best_speed
@@ -283,43 +308,69 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   end
 
   test 'check content-encoding header with compression' do
-    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.2.0")
+    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.2.0")
 
     config = %{
       compression_level best_compression
     }
     instance = driver(config).instance
 
-    assert_equal nil, instance.client.transport.options[:transport_options][:headers]["Content-Encoding"]
+    if elastic_transport_layer?
+      assert_equal nil, instance.client.transport.options[:transport_options][:headers]["Content-Encoding"]
+    elsif elasticsearch_transport_layer_decoupling?
+      assert_equal nil, instance.client.transport.transport.options[:transport_options][:headers]["Content-Encoding"]
+    else
+      assert_equal nil, instance.client.transport.options[:transport_options][:headers]["Content-Encoding"]
+    end
 
     stub_request(:post, "http://localhost:9200/_bulk").
       to_return(status: 200, body: "", headers: {})
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
     compressable = instance.compressable_connection
 
-    assert_equal "gzip", instance.client(nil, compressable).transport.options[:transport_options][:headers]["Content-Encoding"]
+    if elastic_transport_layer?
+      assert_equal "gzip", instance.client(nil, compressable).transport.options[:transport_options][:headers]["Content-Encoding"]
+    elsif elasticsearch_transport_layer_decoupling?
+      assert_equal "gzip", instance.client(nil, compressable).transport.transport.options[:transport_options][:headers]["Content-Encoding"]
+    else
+      assert_equal "gzip", instance.client(nil, compressable).transport.options[:transport_options][:headers]["Content-Encoding"]
+    end
   end
 
   test 'check compression option is passed to transport' do
-    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.2.0")
+    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.2.0")
 
     config = %{
       compression_level best_compression
     }
     instance = driver(config).instance
 
-    assert_equal false, instance.client.transport.options[:compression]
+    if elastic_transport_layer?
+      assert_equal false, instance.client.transport.options[:compression]
+    elsif elasticsearch_transport_layer_decoupling?
+      assert_equal false, instance.client.transport.transport.options[:compression]
+    else
+      assert_equal false, instance.client.transport.options[:compression]
+    end
 
     stub_request(:post, "http://localhost:9200/_bulk").
       to_return(status: 200, body: "", headers: {})
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
     compressable = instance.compressable_connection
 
-    assert_equal true, instance.client(nil, compressable).transport.options[:compression]
+    if elastic_transport_layer?
+      assert_equal true, instance.client(nil, compressable).transport.options[:compression]
+    elsif elasticsearch_transport_layer_decoupling?
+      assert_equal true, instance.client(nil, compressable).transport.transport.options[:compression]
+    else
+      assert_equal true, instance.client(nil, compressable).transport.options[:compression]
+    end
   end
 
   test 'check configure cloud_id based client' do
@@ -406,12 +457,12 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
 
     def stub_elastic_info_bad(url="http://localhost:9200/", version="6.4.2")
-      body ="{\"version\":{\"number\":\"#{version}\"}}"
+      body ="{\"version\":{\"number\":\"#{version}\",\"build_flavor\":\"default\"},\"tagline\":\"You Know, for Search\"}"
       stub_request(:get, url).to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'text/plain' } })
     end
 
     test 'handle invalid client.info' do
-      stub_elastic_info_bad("https://logs.fluentd.com:24225/es//", "7.7.1")
+      stub_elastic_info_bad("https://logs.fluentd.com:24225/es//", elasticsearch_version)
       config = %{
         host     logs.fluentd.com
         port     24225
@@ -423,9 +474,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         scheme https
         @log_level info
       }
-      d = create_driver(config, 7, "\"7.10.1\"")
-      logs = d.logs
-      assert_logs_include(logs, /can not dig version information. Assuming Elasticsearch 7/)
+      if elastic_transport_layer?
+        assert_raise(NoMethodError) do
+          d = create_driver(config, 8, "\"8.0.0\"")
+        end
+      elsif elasticsearch_transport_layer_decoupling?
+        assert_raise(NoMethodError) do
+          d = create_driver(config, 7, "\"7.10.1\"")
+        end
+      else
+        d = create_driver(config, 7, "\"7.10.1\"")
+        logs = d.logs
+        assert_logs_include(logs, /can not dig version information. Assuming Elasticsearch 7/)
+      end
     end
   end
 
@@ -445,21 +506,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   sub_test_case 'ILM default config' do
     setup do
-      begin
-        require "elasticsearch/xpack"
-      rescue LoadError
-        omit "ILM testcase needs elasticsearch-xpack gem."
+      if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
+        begin
+          require "elasticsearch/xpack"
+        rescue LoadError
+          omit "ILM testcase needs elasticsearch-xpack gem."
+        end
+      end
+    end
+
+    def ilm_endpoint
+      if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+        '_enrich'.freeze
+      else
+        '_ilm'.freeze
       end
     end
 
     data("legacy_template" => [true, "_template"],
          "new_template"    => [false, "_index_template"])
     test 'valid configuration of index lifecycle management' do |data|
-      if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.4.0")
+      if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.4.0")
         omit "elastisearch-ruby v7.4.0 or later is needed for ILM."
       end
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -483,11 +554,12 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "http://localhost:9200/_xpack").
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}',
                   :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "http://localhost:9200/_ilm/policy/logstash-policy").
+      stub_request(:get, "http://localhost:9200/#{ilm_endpoint}/policy/logstash-policy").
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "http://localhost:9200/_ilm/policy/logstash-policy").
+      stub_request(:put, "http://localhost:9200/#{ilm_endpoint}/policy/logstash-policy").
         with(body: "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(status: 200, body: "", headers: {})
+      stub_elastic_info
 
       assert_nothing_raised {
         driver(config)
@@ -497,11 +569,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     data("legacy_template" => [true, "_template"],
          "new_template"    => [false, "_index_template"])
     test 'valid configuration of overwriting ilm_policy' do |data|
-      if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.4.0")
+      if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.4.0")
         omit "elastisearch-ruby v7.4.0 or later is needed for ILM."
       end
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -527,11 +599,12 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "http://localhost:9200/_xpack").
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}',
                   :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "http://localhost:9200/_ilm/policy/logstash-policy").
+      stub_request(:get, "http://localhost:9200/#{ilm_endpoint}/policy/logstash-policy").
         to_return(status: 200, body: "", headers: {})
-      stub_request(:put, "http://localhost:9200/_ilm/policy/logstash-policy").
+      stub_request(:put, "http://localhost:9200/#{ilm_endpoint}/policy/logstash-policy").
         with(body: "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"75gb\",\"max_age\":\"50d\"}}}}}}").
         to_return(status: 200, body: "", headers: {})
+      stub_elastic_info
 
       assert_nothing_raised {
         driver(config)
@@ -548,6 +621,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         template_file #{template_file}
         ilm_policy_overwrite true
       }
+      stub_elastic_info
 
       assert_raise(Fluent::ConfigError) {
         driver(config)
@@ -846,6 +920,67 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
   end
 
+  class GetElasticsearchIncompatibleVersionTest < self
+    def create_driver(conf='', client_version="7.14")
+      # For request stub to detect compatibility.
+      @client_version ||= client_version
+      # Ensure original implementation existence.
+      Fluent::Plugin::ElasticsearchOutput.module_eval(<<-CODE)
+        def detect_es_major_version
+          begin
+            @_es_info ||= client.info
+          rescue ::Elasticsearch::UnsupportedProductError => e
+            raise Fluent::ConfigError, "Using Elasticsearch client #{@client_version} is not compatible for your Elasticsearch server. Please check your using elasticsearch gem version and Elasticsearch server."
+          end
+          begin
+            unless version = @_es_info.dig("version", "number")
+              version = @default_elasticsearch_version
+            end
+          rescue NoMethodError => e
+            log.warn "#{@_es_info} can not dig version information. Assuming Elasticsearch #{@default_elasticsearch_version}", error: e
+            version = @default_elasticsearch_version
+          end
+          version.to_i
+        end
+      CODE
+      Fluent::Plugin::ElasticsearchOutput.module_eval(<<-CODE)
+        def client_library_version
+          #{@client_version}
+        end
+      CODE
+      Fluent::Test::Driver::Output.new(Fluent::Plugin::ElasticsearchOutput).configure(conf)
+    end
+
+    def test_incompatible_es_version
+      if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.14.0")
+        omit "This test is not effective before elasticsearch 7.14"
+      end
+      config = %{
+        host            logs.google.com
+        port            778
+        scheme          https
+        path            /es/
+        user            john
+        password        doe
+        verify_es_version_at_startup true
+        max_retry_get_es_version 1
+      }
+
+      connection_resets = 0
+      stub_request(:get, "https://logs.google.com:778/es//").
+        with(basic_auth: ['john', 'doe']) do |req|
+        connection_resets += 1
+        raise ::Elasticsearch::UnsupportedProductError
+      end
+
+      assert_raise(Fluent::ConfigError) do
+        create_driver(config)
+      end
+
+      assert_equal(1, connection_resets)
+    end
+  end
+
   class GetElasticsearchVersionWithFallbackTest < self
     def create_driver(conf='', client_version="\"5.0\"")
       # For request stub to detect compatibility.
@@ -907,7 +1042,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_already_present(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     config = %{
@@ -930,6 +1065,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -940,7 +1076,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_create(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -974,6 +1110,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -984,7 +1121,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_create_with_rollover_index_and_template_related_placeholders(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -1037,6 +1174,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver(config)
 
     elastic_request = stub_elastic("https://logs.google.com:777/es//_bulk")
+    stub_elastic_info("https://logs.google.com:777/es//")
     driver.run(default_tag: 'test.template') do
       driver.feed(sample_record)
     end
@@ -1052,7 +1190,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_create_with_rollover_index_and_template_related_placeholders_with_truncating_caches(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -1102,6 +1240,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe'],
            body: "{\"aliases\":{\"myapp_deflector-test.template\":{\"is_write_index\":true}}}").
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -1125,21 +1264,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   class TemplateIndexLifecycleManagementTest < self
     def setup
-      begin
-        require "elasticsearch/xpack"
-      rescue LoadError
-        omit "ILM testcase needs elasticsearch-xpack gem."
+      if Gem::Version.new(Elasticsearch::VERSION) < Gem::Version.new("8.0.0")
+        begin
+          require "elasticsearch/xpack"
+        rescue LoadError
+          omit "ILM testcase needs elasticsearch-xpack gem."
+        end
       end
-      if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.4.0")
+      if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.4.0")
         omit "elastisearch-ruby v7.4.0 or later is needed for ILM."
       end
     end
 
+    def ilm_endpoint
+      if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+        '_enrich'.freeze
+      else
+        '_ilm'.freeze
+      end
+    end
+
     data("legacy_template" => [true, "_template"],
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_default_ilm(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -1205,13 +1354,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -1222,7 +1372,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_default_ilm_on_logstash_format(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -1291,13 +1441,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -1314,7 +1465,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_default_ilm_and_ilm_policy_overwrite(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -1382,13 +1533,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"60gb\",\"max_age\":\"45d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -1424,7 +1576,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_default_ilm_with_empty_index_date_pattern(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -1490,13 +1642,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -1507,7 +1660,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_custom_ilm(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -1574,13 +1727,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"70gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -1591,7 +1745,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_ilm_policies_and_placeholderstest_template_create_with_rollover_index_and_ilm_policies_and_placeholders(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -1658,13 +1812,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"70gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -1682,7 +1837,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
            "new_template"    => [false, "_index_template"])
       def test_tag_placeholder(data)
         use_legacy_template_flag, endpoint = data
-        if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+        if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
           omit "elastisearch-ruby v7.8.0 or later is needed."
         end
         cwd = File.dirname(__FILE__)
@@ -1749,13 +1904,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         stub_request(:get, "https://logs.google.com:777/es//_xpack").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-        stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+        stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 404, :body => "", :headers => {})
-        stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+        stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
           with(basic_auth: ['john', 'doe'],
                body: "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"70gb\",\"max_age\":\"30d\"}}}}}}").
           to_return(:status => 200, :body => "", :headers => {})
+        stub_elastic_info("https://logs.google.com:777/es//")
 
         driver(config)
 
@@ -1772,7 +1928,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
            "new_template"    => [false, "_index_template"])
       def test_tag_placeholder_with_multiple_policies(data)
         use_legacy_template_flag, endpoint = data
-        if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+        if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
           omit "elastisearch-ruby v7.8.0 or later is needed."
         end
         cwd = File.dirname(__FILE__)
@@ -1839,13 +1995,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         stub_request(:get, "https://logs.google.com:777/es//_xpack").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-        stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy2").
+        stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy2").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 404, :body => "", :headers => {})
-        stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy2").
+        stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy2").
           with(basic_auth: ['john', 'doe'],
                body: "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"80gb\",\"max_age\":\"20d\"}}}}}}").
           to_return(:status => 200, :body => "", :headers => {})
+        stub_elastic_info("https://logs.google.com:777/es//")
 
         driver(config)
 
@@ -1863,7 +2020,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_default_ilm_and_placeholders(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -1929,10 +2086,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
@@ -1964,13 +2121,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -1993,7 +2151,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_default_ilm_and_placeholders_and_index_separator(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -2060,13 +2218,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -2085,7 +2244,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_template_create_with_rollover_index_and_default_ilm_and_custom_and_time_placeholders(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -2156,13 +2315,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/logstash-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/logstash-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -2183,7 +2343,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_custom_template_create(data)
     use_legacy_template_flag, endpoint = data
 
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -2218,6 +2378,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -2228,7 +2389,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_custom_template_create_with_customize_template_related_placeholders(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -2270,6 +2431,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver(config)
 
     stub_elastic("https://logs.google.com:777/es//_bulk")
+    stub_elastic_info("https://logs.google.com:777/es//")
     driver.run(default_tag: 'test.template') do
       driver.feed(sample_record)
     end
@@ -2281,7 +2443,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_custom_template_installation_for_host_placeholder(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -2321,6 +2483,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver(config)
 
     stub_elastic("https://logs-test.google.com:777/es//_bulk")
+    stub_elastic_info("https://logs-test.google.com:777/es//")
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -2330,7 +2493,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_custom_template_with_rollover_index_create(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -2381,6 +2544,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/mylogs").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -2391,7 +2555,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_custom_template_with_rollover_index_create_and_deflector_alias(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -2443,6 +2607,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/myapp_deflector").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -2453,7 +2618,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_custom_template_with_rollover_index_create_with_logstash_format(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -2511,6 +2676,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver(config)
 
     elastic_request = stub_elastic("https://logs.google.com:777/es//_bulk")
+    stub_elastic_info("https://logs.google.com:777/es//")
     driver.run(default_tag: 'custom-test') do
       driver.feed(sample_record)
     end
@@ -2519,21 +2685,32 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   class CustomTemplateIndexLifecycleManagementTest < self
     def setup
-      begin
-        require "elasticsearch/xpack"
-      rescue LoadError
-        omit "ILM testcase needs elasticsearch-xpack gem."
+      if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
+        begin
+          require "elasticsearch/xpack"
+        rescue LoadError
+          omit "ILM testcase needs elasticsearch-xpack gem."
+        end
       end
-      if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.4.0")
+      if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.4.0")
         omit "elastisearch-ruby v7.4.0 or later is needed."
       end
     end
 
+
+    def ilm_endpoint
+      if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+        '_enrich'.freeze
+      else
+        '_ilm'.freeze
+      end
+    end
+
     data("legacy_template" => [true, "_template"],
          "new_template"    => [false, "_index_template"])
     def test_custom_template_with_rollover_index_create_and_default_ilm(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -2603,14 +2780,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
-
+      stub_elastic_info("https://logs.google.com:777/es//")
       driver(config)
 
       assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs", times: 1)
@@ -2620,7 +2797,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_custom_template_with_rollover_index_create_and_default_ilm_and_ilm_policy_overwrite(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -2692,13 +2869,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"60gb\",\"max_age\":\"45d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -2728,6 +2906,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       }
 
       # Should raise error because multiple alias indices IllegalArgument Error on executing ILM feature
+      stub_elastic_info("https://logs.google.com:777/es//")
       assert_raise(Fluent::ConfigError) do
         driver(config)
       end
@@ -2737,7 +2916,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_custom_template_with_rollover_index_create_and_default_ilm_and_placeholders(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -2809,10 +2988,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
@@ -2856,13 +3035,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
+      stub_elastic_info("https://logs.google.com:777/es//")
 
       driver(config)
 
@@ -2883,7 +3063,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
          "new_template"    => [false, "_index_template"])
     def test_custom_template_with_rollover_index_create_and_custom_ilm(data)
       use_legacy_template_flag, endpoint = data
-      if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+      if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
         omit "elastisearch-ruby v7.8.0 or later is needed."
       end
       cwd = File.dirname(__FILE__)
@@ -2946,14 +3126,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
-      stub_request(:get, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:get, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//_ilm/policy/fluentd-policy").
+      stub_request(:put, "https://logs.google.com:777/es//#{ilm_endpoint}/policy/fluentd-policy").
         with(basic_auth: ['john', 'doe'],
              :body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"70gb\",\"max_age\":\"30d\"}}}}}}").
         to_return(:status => 200, :body => "", :headers => {})
-
+      stub_elastic_info("https://logs.google.com:777/es//")
       driver(config)
 
       assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs", times: 1)
@@ -2964,7 +3144,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_overwrite(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -2999,6 +3179,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -3009,7 +3190,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_custom_template_overwrite(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3045,6 +3226,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -3055,7 +3237,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_custom_template_with_rollover_index_overwrite(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3107,6 +3289,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-myapp-%7Bnow%2Fd%7D-000001%3E/#{alias_endpoint}/myapp_deflector").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -3133,7 +3316,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
-
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     assert_raise(RuntimeError) {
       driver(config)
@@ -3144,7 +3327,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_create_for_host_placeholder(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3185,7 +3368,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
     driver(config)
 
-    stub_elastic("https://logs.google.com:777/es//_bulk")
+    stub_elastic("https://logs-test.google.com:777/es//_bulk")
+    stub_elastic_info("https://logs-test.google.com:777/es//")
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -3195,7 +3379,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_retry_install_fails(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3225,6 +3409,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       connection_resets += 1
       raise Faraday::ConnectionFailed, "Test message"
     end
+    stub_elastic_info("https://logs.google.com:778/es//")
 
     assert_raise(Fluent::Plugin::ElasticsearchError::RetryableOperationExhaustedFailure) do
       driver(config)
@@ -3233,13 +3418,13 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_equal(4, connection_resets)
   end
 
-  transport_errors_handled_separately = [Elasticsearch::Transport::Transport::Errors::NotFound]
-  transport_errors = Elasticsearch::Transport::Transport::Errors.constants.map { |err| [err, Elasticsearch::Transport::Transport::Errors.const_get(err)]  }
+  transport_errors_handled_separately = [TRANSPORT_CLASS::Transport::Errors::NotFound]
+  transport_errors = TRANSPORT_CLASS::Transport::Errors.constants.map { |err| [err, TRANSPORT_CLASS::Transport::Errors.const_get(err)]  }
   transport_errors_hash = Hash[transport_errors.select { |err| !transport_errors_handled_separately.include?(err[1]) } ]
 
   data(transport_errors_hash)
   def test_template_retry_transport_errors(error)
-    endpoint, use_legacy_template_flag = if Gem::Version.create(::Elasticsearch::Transport::VERSION) >= Gem::Version.create("7.8.0")
+    endpoint, use_legacy_template_flag = if Gem::Version.create(::TRANSPORT_CLASS::VERSION) >= Gem::Version.create("7.8.0")
                  ["_index_template".freeze, false]
                else
                  ["_template".freeze, true]
@@ -3266,6 +3451,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       retries += 1
       raise error
     end
+    stub_elastic_info("https://logs.google.com:778/es//")
 
     assert_raise(Fluent::Plugin::ElasticsearchError::RetryableOperationExhaustedFailure) do
       driver(config)
@@ -3278,7 +3464,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_template_retry_install_does_not_fail(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3309,6 +3495,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       connection_resets += 1
       raise Faraday::ConnectionFailed, "Test message"
     end
+    stub_elastic_info("https://logs.google.com:778/es//")
 
     driver(config)
 
@@ -3319,7 +3506,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_templates_create(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3364,6 +3551,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash3").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -3376,7 +3564,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_templates_overwrite(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3421,6 +3609,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash3").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -3433,7 +3622,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_templates_are_also_used(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3479,6 +3668,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     driver(config)
 
@@ -3492,7 +3682,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
        "new_template"    => [false, "_index_template"])
   def test_templates_can_be_partially_created_if_error_occurs(data)
     use_legacy_template_flag, endpoint = data
-    if !use_legacy_template_flag && Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.8.0")
+    if !use_legacy_template_flag && Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.8.0")
       omit "elastisearch-ruby v7.8.0 or later is needed."
     end
     cwd = File.dirname(__FILE__)
@@ -3529,6 +3719,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
+    stub_elastic_info("https://logs.google.com:777/es//")
 
     assert_raise(RuntimeError) {
       driver(config)
@@ -3545,6 +3736,9 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       path     /es/
       port     123
     }
+    stub_elastic_info("https://host1:50")
+    stub_elastic_info("https://host2:100")
+    stub_elastic_info("https://host3:123")
     instance = driver(config).instance
 
     assert_equal 3, instance.get_connection_options[:hosts].length
@@ -3567,6 +3761,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       user     default_user
       password default_password
     }
+    stub_elastic_info("https://john:password@host1:443/elastic/")
+    stub_elastic_info("http://host2")
     instance = driver(config).instance
 
     assert_equal 2, instance.get_connection_options[:hosts].length
@@ -3593,6 +3789,9 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       user     default_user
       password default_password
     }
+    stub_elastic_info("https://j%2Bhn:passw%40rd@host1:443/elastic/")
+    stub_elastic_info("http://host2")
+
     instance = driver(config).instance
 
     assert_equal 2, instance.get_connection_options[:hosts].length
@@ -3612,6 +3811,74 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_equal '/default_path', host2[:path]
   end
 
+  class IPv6AdressStringHostsTest < self
+    def test_legacy_hosts_list
+      config = %{
+        hosts    "[2404:7a80:d440:3000:192a:a292:bd7f:ca19]:50,host2:100,host3"
+        scheme   https
+        path     /es/
+        port     123
+      }
+      instance = driver(config).instance
+
+      assert_raise(URI::InvalidURIError) do
+        instance.get_connection_options[:hosts].length
+      end
+    end
+
+    def test_hosts_list
+      config = %{
+        hosts    https://john:password@[2404:7a80:d440:3000:192a:a292:bd7f:ca19]:443/elastic/,http://host2
+        path     /default_path
+        user     default_user
+        password default_password
+      }
+      instance = driver(config).instance
+
+      assert_equal 2, instance.get_connection_options[:hosts].length
+      host1, host2 = instance.get_connection_options[:hosts]
+
+      assert_equal '[2404:7a80:d440:3000:192a:a292:bd7f:ca19]', host1[:host]
+      assert_equal 443, host1[:port]
+      assert_equal 'https', host1[:scheme]
+      assert_equal 'john', host1[:user]
+      assert_equal 'password', host1[:password]
+      assert_equal '/elastic/', host1[:path]
+
+      assert_equal 'host2', host2[:host]
+      assert_equal 'http', host2[:scheme]
+      assert_equal 'default_user', host2[:user]
+      assert_equal 'default_password', host2[:password]
+      assert_equal '/default_path', host2[:path]
+    end
+
+    def test_hosts_list_with_escape_placeholders
+      config = %{
+        hosts    https://%{j+hn}:%{passw@rd}@[2404:7a80:d440:3000:192a:a292:bd7f:ca19]:443/elastic/,http://host2
+        path     /default_path
+        user     default_user
+        password default_password
+      }
+      instance = driver(config).instance
+
+      assert_equal 2, instance.get_connection_options[:hosts].length
+      host1, host2 = instance.get_connection_options[:hosts]
+
+      assert_equal '[2404:7a80:d440:3000:192a:a292:bd7f:ca19]', host1[:host]
+      assert_equal 443, host1[:port]
+      assert_equal 'https', host1[:scheme]
+      assert_equal 'j%2Bhn', host1[:user]
+      assert_equal 'passw%40rd', host1[:password]
+      assert_equal '/elastic/', host1[:path]
+
+      assert_equal 'host2', host2[:host]
+      assert_equal 'http', host2[:scheme]
+      assert_equal 'default_user', host2[:user]
+      assert_equal 'default_password', host2[:password]
+      assert_equal '/default_path', host2[:path]
+    end
+  end
+
   def test_single_host_params_and_defaults
     config = %{
       host     logs.google.com
@@ -3665,6 +3932,46 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert(ports.none? { |p| p == 9200 })
   end
 
+  class IPv6AdressStringHostTest < self
+    def test_single_host_params_and_defaults
+      config = %{
+        host     2404:7a80:d440:3000:192a:a292:bd7f:ca19
+        user     john
+        password doe
+      }
+      instance = driver(config).instance
+
+      assert_equal 1, instance.get_connection_options[:hosts].length
+      host1 = instance.get_connection_options[:hosts][0]
+
+      assert_equal '[2404:7a80:d440:3000:192a:a292:bd7f:ca19]', host1[:host]
+      assert_equal 9200, host1[:port]
+      assert_equal 'http', host1[:scheme]
+      assert_equal 'john', host1[:user]
+      assert_equal 'doe', host1[:password]
+      assert_equal nil, host1[:path]
+    end
+
+    def test_single_host_params_and_defaults_with_escape_placeholders
+      config = %{
+        host     2404:7a80:d440:3000:192a:a292:bd7f:ca19
+        user     %{j+hn}
+        password %{d@e}
+      }
+      instance = driver(config).instance
+
+      assert_equal 1, instance.get_connection_options[:hosts].length
+      host1 = instance.get_connection_options[:hosts][0]
+
+      assert_equal '[2404:7a80:d440:3000:192a:a292:bd7f:ca19]', host1[:host]
+      assert_equal 9200, host1[:port]
+      assert_equal 'http', host1[:scheme]
+      assert_equal 'j%2Bhn', host1[:user]
+      assert_equal 'd%40e', host1[:password]
+      assert_equal nil, host1[:path]
+    end
+  end
+
   def test_password_is_required_if_specify_user
     config = %{
       user john
@@ -3685,6 +3992,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
                           with(headers: { "Content-Type" => "application/json" })
     end
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -3696,6 +4004,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       to_return(:status => 200, :body => "", :headers => {})
     elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
                         with(headers: {'custom' => 'header1','and_others' => 'header2' })
+    stub_elastic_info
     driver.configure(%[custom_headers {"custom":"header1", "and_others":"header2"}])
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
@@ -3708,6 +4017,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       to_return(:status => 200, :body => "", :headers => {})
     elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
                         with(headers: {'Authorization'=>'ApiKey dGVzdGF1dGhoZWFkZXI='})
+    stub_elastic_info
     driver.configure(%[api_key testauthheader])
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
@@ -3718,6 +4028,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_write_message_with_bad_chunk
     driver.configure("target_index_key bad_value\n@log_level debug\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed({'bad_value'=>"\255"})
     end
@@ -3733,6 +4044,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_default_index(data)
     version, index_name = data
     stub_elastic
+    stub_elastic_info
     driver("", version)
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
@@ -3751,7 +4063,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
 
   def test_writes_to_default_index_with_compression
-    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.2.0")
+    omit "elastisearch-ruby v7.2.0 or later is needed." if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.2.0")
 
     config = %[
       compression_level default_compression
@@ -3774,6 +4086,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
     elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
         to_return(:status => 200, :headers => {'Content-Type' => 'Application/json'}, :body => compressed_body)
+    stub_elastic_info("http://localhost:9200/")
 
     driver(config)
     driver.run(default_tag: 'test') do
@@ -3790,6 +4103,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_default_type(data)
     version, index_type = data
     stub_elastic
+    stub_elastic_info
     driver("", version)
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
@@ -3800,6 +4114,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_speficied_index
     driver.configure("index_name myindex\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -3819,6 +4134,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                        ]
                      ))
     request = stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record('huge_record' => ("a" * 20 * 1024 * 1024)))
       driver.feed(sample_record('huge_record' => ("a" * 20 * 1024 * 1024)))
@@ -3838,11 +4154,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                                                      }, [])
                        ]
                      ))
+    index_part = if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+                   '{"index":{"_index":"fluentd"}}'
+                 elsif Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("7.0.0")
+                   '{"index":{"_index":"fluentd","_type":"_doc"}}'
+                 else
+                   '{"index":{"_index":"fluentd","_type":"fluentd"}}'
+                 end
     stub_request(:post, "http://localhost:9200/_bulk").
       with(
-        body: /{"index":{"_index":"fluentd","_type":"fluentd"}}\n{"age":26,"request_id":"42","parent_id":"parent","routing_id":"routing","#{chunk_id_key}":".*"}\n/) do |req|
+        body: /#{index_part}\n{"age":26,"request_id":"42","parent_id":"parent","routing_id":"routing","#{chunk_id_key}":".*"}\n/) do |req|
       @index_cmds = req.body.split("\n").map {|r| JSON.parse(r) }
     end
+    stub_elastic_info
     driver.run(default_tag: 'test', shutdown: false) do
       driver.feed(sample_record)
     end
@@ -3872,6 +4196,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                        ]
                      ))
     request = stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record('huge_record' => ("a" * 20 * 1024 * 1024)))
       driver.feed(sample_record('huge_record' => ("a" * 20 * 1024 * 1024)))
@@ -3884,6 +4209,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_writes_to_speficied_index_with_tag_placeholder
       driver.configure("index_name myindex.${tag}\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)
       end
@@ -3903,6 +4229,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                          ]
                        ))
       stub_elastic
+      stub_elastic_info
       time = Time.parse Date.today.iso8601
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record)
@@ -3923,6 +4250,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       pipeline_id = "mypipeline"
       logstash_index = "myindex.#{pipeline_id}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record.merge({"pipeline_id" => pipeline_id}))
       end
@@ -3933,6 +4261,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_speficied_index_uppercase
     driver.configure("index_name MyIndex\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -3944,6 +4273,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_target_index_key
     driver.configure("target_index_key @target_index\n")
     stub_elastic
+    stub_elastic_info
     record = sample_record.clone
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge('@target_index' => 'local-override'))
@@ -3957,17 +4287,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       logstash_format true")
     time = Time.parse Date.today.iso8601
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record.merge('@target_index' => 'local-override'))
     end
     assert_equal('local-override', index_cmds.first['index']['_index'])
   end
 
-   def test_writes_to_target_index_key_logstash_uppercase
+  def test_writes_to_target_index_key_logstash_uppercase
     driver.configure("target_index_key @target_index
                       logstash_format true")
     time = Time.parse Date.today.iso8601
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record.merge('@target_index' => 'LOCAL-OVERRIDE'))
     end
@@ -3980,17 +4312,203 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     pipeline = "fluentd"
     driver.configure("pipeline #{pipeline}")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
     assert_equal(pipeline, index_cmds.first['index']['pipeline'])
   end
 
+  def stub_elastic_affinity_target_index_search_with_body(url="http://localhost:9200/logstash-*/_search", ids, return_body_str)
+    # Note: ids used in query is unique list of ids
+    stub_request(:post, url)
+      .with(
+        body: "{\"query\":{\"ids\":{\"values\":#{ids.uniq.to_json}}},\"_source\":false,\"sort\":[{\"_index\":{\"order\":\"desc\"}}]}",
+      )
+      .to_return(lambda do |req|
+      { :status => 200,
+        :headers => { 'Content-Type' => 'json' },
+        :body => return_body_str
+      }
+    end)
+  end
+
+  def stub_elastic_affinity_target_index_search(url="http://localhost:9200/logstash-*/_search", ids, indices)
+    # Example ids and indices arrays.
+    #  [ "3408a2c8eecd4fbfb82e45012b54fa82", "2816fc6ef4524b3f8f7e869002005433"]
+    #  [ "logstash-2021.04.28", "logstash-2021.04.29"]
+    body = %({
+      "took" : 31,
+      "timed_out" : false,
+      "_shards" : {
+        "total" : 52,
+        "successful" : 52,
+        "skipped" : 48,
+        "failed" : 0
+      },
+      "hits" : {
+        "total" : {
+          "value" : 356,
+          "relation" : "eq"
+        },
+        "max_score" : null,
+        "hits" : [
+          {
+            "_index" : "#{indices[0]}",
+            "_type" : "_doc",
+            "_id" : "#{ids[0]}",
+            "_score" : null,
+            "sort" : [
+              "#{indices[0]}"
+            ]
+          },
+          {
+            "_index" : "#{indices[1]}",
+            "_type" : "_doc",
+            "_id" : "#{ids[1]}",
+            "_score" : null,
+            "sort" : [
+              "#{indices[1]}"
+            ]
+          }
+        ]
+      }
+    })
+    stub_elastic_affinity_target_index_search_with_body(ids, body)
+  end
+
+  def stub_elastic_affinity_target_index_search_return_empty(url="http://localhost:9200/logstash-*/_search", ids)
+    empty_body = %({
+      "took" : 5,
+      "timed_out" : false,
+      "_shards" : {
+        "total" : 54,
+        "successful" : 54,
+        "skipped" : 53,
+        "failed" : 0
+      },
+      "hits" : {
+        "total" : {
+          "value" : 0,
+          "relation" : "eq"
+        },
+        "max_score" : null,
+        "hits" : [ ]
+      }
+    })
+    stub_elastic_affinity_target_index_search_with_body(ids, empty_body)
+  end
+
+  def test_writes_to_affinity_target_index
+    driver.configure("target_index_affinity true
+                      logstash_format true
+                      id_key my_id
+                      write_operation update")
+
+    my_id_value = "3408a2c8eecd4fbfb82e45012b54fa82"
+    ids = [my_id_value]
+    indices = ["logstash-2021.04.28"]
+    stub_elastic
+    stub_elastic_info
+    stub_elastic_affinity_target_index_search(ids, indices)
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record('my_id' => my_id_value))
+    end
+    assert_equal('logstash-2021.04.28', index_cmds.first['update']['_index'])
+  end
+
+  def test_writes_to_affinity_target_index_write_operation_upsert
+    driver.configure("target_index_affinity true
+                      logstash_format true
+                      id_key my_id
+                      write_operation upsert")
+
+    my_id_value = "3408a2c8eecd4fbfb82e45012b54fa82"
+    ids = [my_id_value]
+    indices = ["logstash-2021.04.28"]
+    stub_elastic
+    stub_elastic_info
+    stub_elastic_affinity_target_index_search(ids, indices)
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record('my_id' => my_id_value))
+    end
+    assert_equal('logstash-2021.04.28', index_cmds.first['update']['_index'])
+  end
+
+  def test_writes_to_affinity_target_index_index_not_exists_yet
+    driver.configure("target_index_affinity true
+                      logstash_format true
+                      id_key my_id
+                      write_operation update")
+
+    my_id_value = "3408a2c8eecd4fbfb82e45012b54fa82"
+    ids = [my_id_value]
+    stub_elastic
+    stub_elastic_info
+    stub_elastic_affinity_target_index_search_return_empty(ids)
+    time = Time.parse Date.today.iso8601
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record('my_id' => my_id_value))
+    end
+    assert_equal("logstash-#{time.utc.strftime("%Y.%m.%d")}", index_cmds.first['update']['_index'])
+  end
+
+  def test_writes_to_affinity_target_index_multiple_indices
+    driver.configure("target_index_affinity true
+                      logstash_format true
+                      id_key my_id
+                      write_operation update")
+
+    my_id_value = "2816fc6ef4524b3f8f7e869002005433"
+    my_id_value2 = "3408a2c8eecd4fbfb82e45012b54fa82"
+    ids = [my_id_value, my_id_value2]
+    indices = ["logstash-2021.04.29", "logstash-2021.04.28"]
+    stub_elastic_info
+    stub_elastic_all_requests
+    stub_elastic_affinity_target_index_search(ids, indices)
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record('my_id' => my_id_value))
+      driver.feed(sample_record('my_id' => my_id_value2))
+    end
+    assert_equal(2, index_cmds_all_requests.count)
+    assert_equal('logstash-2021.04.29', index_cmds_all_requests[0].first['update']['_index'])
+    assert_equal(my_id_value, index_cmds_all_requests[0].first['update']['_id'])
+    assert_equal('logstash-2021.04.28', index_cmds_all_requests[1].first['update']['_index'])
+    assert_equal(my_id_value2, index_cmds_all_requests[1].first['update']['_id'])
+  end
+
+  def test_writes_to_affinity_target_index_same_id_dublicated_write_to_oldest_index
+    driver.configure("target_index_affinity true
+                      logstash_format true
+                      id_key my_id
+                      write_operation update")
+
+    my_id_value = "2816fc6ef4524b3f8f7e869002005433"
+    # It may happen than same id has inserted to two index while data inserted during rollover period
+    ids = [my_id_value, my_id_value]
+    # Simulate the used sorting here, as search sorts indices in DESC order to pick only oldest index per single _id
+    indices = ["logstash-2021.04.29", "logstash-2021.04.28"]
+
+    stub_elastic_info
+    stub_elastic_all_requests
+    stub_elastic_affinity_target_index_search(ids, indices)
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record('my_id' => my_id_value))
+      driver.feed(sample_record('my_id' => my_id_value))
+    end
+    assert_equal('logstash-2021.04.28', index_cmds.first['update']['_index'])
+
+    assert_equal(1, index_cmds_all_requests.count)
+    assert_equal('logstash-2021.04.28', index_cmds_all_requests[0].first['update']['_index'])
+    assert_equal(my_id_value, index_cmds_all_requests[0].first['update']['_id'])
+  end
+
   class PipelinePlaceholdersTest < self
     def test_writes_to_default_index_with_pipeline_tag_placeholder
       pipeline = "fluentd-${tag}"
       driver.configure("pipeline #{pipeline}")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test.builtin.placeholder') do
         driver.feed(sample_record)
       end
@@ -4012,6 +4530,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       time = Time.parse Date.today.iso8601
       pipeline = "fluentd-#{time.getutc.strftime("%Y%m%d")}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record)
       end
@@ -4031,6 +4550,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       pipeline_id = "mypipeline"
       logstash_index = "fluentd-#{pipeline_id}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record.merge({"pipeline_id" => pipeline_id}))
       end
@@ -4041,6 +4561,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_target_index_key_fallack
     driver.configure("target_index_key @target_index\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4053,6 +4574,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     time = Time.parse Date.today.iso8601
     logstash_index = "logstash-#{time.getutc.strftime("%Y.%m.%d")}"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record)
     end
@@ -4066,6 +4588,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_speficied_type(data)
     driver('', data["es_version"]).configure("type_name mytype\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4079,6 +4602,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_speficied_type_with_placeholders(data)
     driver('', data["es_version"]).configure("type_name mytype.${tag}\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4093,6 +4617,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver('', data["es_version"])
       .configure("type_name mytype.${tag}\nsuppress_type_name true")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4107,6 +4632,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_target_type_key(data)
     driver('', data["es_version"]).configure("target_type_key @target_type\n")
     stub_elastic
+    stub_elastic_info
     record = sample_record.clone
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge('@target_type' => 'local-override'))
@@ -4118,20 +4644,34 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_target_type_key_fallack_to_default
     driver.configure("target_type_key @target_type\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
-    assert_equal(default_type_name, index_cmds.first['index']['_type'])
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+      assert_nil(index_cmds.first['index']['_type'])
+    elsif Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("7.0.0")
+      assert_equal("_doc", index_cmds.first['index']['_type'])
+    else
+      assert_equal("fluentd", index_cmds.first['index']['_type'])
+    end
   end
 
   def test_writes_to_target_type_key_fallack_to_type_name
     driver.configure("target_type_key @target_type
                       type_name mytype")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
-    assert_equal('mytype', index_cmds.first['index']['_type'])
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+      assert_nil(index_cmds.first['index']['_type'])
+    elsif Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("7.0.0")
+      assert_equal("_doc", index_cmds.first['index']['_type'])
+    else
+      assert_equal("fluentd", index_cmds.first['index']['_type'])
+    end
   end
 
   data("old"           => {"es_version" => 2, "_type" => "local-override"},
@@ -4142,6 +4682,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_target_type_key_nested(data)
     driver('', data["es_version"]).configure("target_type_key kubernetes.labels.log_type\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge('kubernetes' => {
         'labels' => {
@@ -4156,6 +4697,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_target_type_key_fallack_to_default_nested
     driver.configure("target_type_key kubernetes.labels.log_type\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge('kubernetes' => {
         'labels' => {
@@ -4163,12 +4705,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         }
       }))
     end
-    assert_equal(default_type_name, index_cmds.first['index']['_type'])
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+      assert_nil(index_cmds.first['index']['_type'])
+    elsif Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("7.0.0")
+      assert_equal("_doc", index_cmds.first['index']['_type'])
+    else
+      assert_equal("fluentd", index_cmds.first['index']['_type'])
+    end
   end
 
   def test_writes_to_speficied_host
     driver.configure("host 192.168.33.50\n")
     elastic_request = stub_elastic("http://192.168.33.50:9200/_bulk")
+    stub_elastic_info("http://192.168.33.50:9200/")
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4178,6 +4727,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_writes_to_speficied_port
     driver.configure("port 9201\n")
     elastic_request = stub_elastic("http://localhost:9201/_bulk")
+    stub_elastic_info("http://localhost:9201")
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4193,6 +4743,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     hosts.each do |host_info|
       host, port = host_info
       stub_elastic_with_store_index_command_counts("http://#{host}:#{port}/_bulk")
+      stub_elastic_info("http://#{host}:#{port}/")
     end
 
     driver.run(default_tag: 'test') do
@@ -4229,6 +4780,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     ]}
 
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(original_hash)
     end
@@ -4242,6 +4794,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     expected_output = {"foo" => {"bar" => "baz"}}
 
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(original_hash)
     end
@@ -4250,6 +4803,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   def test_makes_bulk_request
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
       driver.feed(sample_record.merge('age' => 27))
@@ -4257,8 +4811,9 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_equal(4, index_cmds.count)
   end
 
-  def test_all_records_are_preserved_in_bulk
+  def test_all_re
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
       driver.feed(sample_record.merge('age' => 27))
@@ -4274,6 +4829,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     dt = DateTime.new(2015, 6, 1, 0, 0, 1, "+01:00")
     logstash_index = "logstash-2015.05.31"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(dt.to_time.to_i, sample_record)
     end
@@ -4288,6 +4844,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     time = Date.today.to_time
     index = "logstash-#{time.strftime("%Y.%m.%d")}"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record)
     end
@@ -4300,6 +4857,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     time = Time.parse Date.today.iso8601
     logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m.%d")}"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record)
     end
@@ -4314,6 +4872,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     time = Time.parse Date.today.iso8601
     logstash_index = "myprefix#{separator}#{time.getutc.strftime("%Y.%m.%d")}"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record)
     end
@@ -4327,6 +4886,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       time = Time.parse Date.today.iso8601
       logstash_index = "myprefix-test-#{time.getutc.strftime("%Y.%m.%d")}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record)
       end
@@ -4349,6 +4909,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       time = Time.parse Date.today.iso8601
       logstash_index = "myprefix-#{time.getutc.strftime("%H")}-#{time.getutc.strftime("%Y.%m.%d")}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record)
       end
@@ -4369,6 +4930,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       pipeline_id = "mypipeline"
       logstash_index = "myprefix-#{pipeline_id}-#{time.getutc.strftime("%Y.%m.%d")}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record.merge({"pipeline_id" => pipeline_id}))
       end
@@ -4394,6 +4956,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       time = Time.parse Date.today.iso8601
       logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m.%d")}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record.merge('indexformat' => '%Y.%m.%d'))
       end
@@ -4417,6 +4980,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       time = Time.parse Date.today.iso8601
       logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m")}"
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record.merge('indexformat' => '%Y.%m'))
       end
@@ -4429,6 +4993,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       driver.configure("host ${tag}\n")
       time = Time.parse Date.today.iso8601
       elastic_request = stub_elastic("http://extracted-host:9200/_bulk")
+      stub_elastic_info("http://extracted-host:9200/")
       driver.run(default_tag: 'extracted-host') do
         driver.feed(time.to_i, sample_record)
       end
@@ -4445,6 +5010,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         host, port = host_info
         host = "extracted-host" if host == '${tag}'
         stub_elastic_with_store_index_command_counts("http://#{host}:#{port}/_bulk")
+        stub_elastic_info("http://#{host}:#{port}")
       end
 
       driver.run(default_tag: 'extracted-host') do
@@ -4479,8 +5045,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                          ]
                        ))
       stub_elastic
+      stub_elastic_info
       time = Time.parse Date.today.iso8601
       elastic_request = stub_elastic("http://host-#{time.utc.strftime('%Y%m%d')}:9200/_bulk")
+      stub_elastic_info("http://host-#{time.utc.strftime('%Y%m%d')}:9200/")
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record)
       end
@@ -4501,6 +5069,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       second_pipeline_id = "2"
       first_request = stub_elastic("http://myhost-1:9200/_bulk")
       second_request = stub_elastic("http://myhost-2:9200/_bulk")
+      stub_elastic_info("http://myhost-1:9200/")
+      stub_elastic_info("http://myhost-2:9200/")
       driver.run(default_tag: 'test') do
         driver.feed(time.to_i, sample_record.merge({"pipeline_id" => first_pipeline_id}))
         driver.feed(time.to_i, sample_record.merge({"pipeline_id" => second_pipeline_id}))
@@ -4521,6 +5091,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       time = Time.parse Date.today.iso8601
       pipeline_id = "1"
       request = stub_elastic_unavailable("http://myhost-1:9200/_bulk")
+      stub_elastic_info("http://myhost-1:9200/")
       exception = assert_raise(Fluent::Plugin::ElasticsearchOutput::RecoverableRequestFailure) {
         driver.run(default_tag: 'test') do
           driver.feed(time.to_i, sample_record.merge({"pipeline_id" => pipeline_id}))
@@ -4536,6 +5107,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     time = Time.parse Date.today.iso8601
     logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m.%d")}"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record)
     end
@@ -4550,6 +5122,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     time = Time.parse Date.today.iso8601
     logstash_index = "logstash-#{time.getutc.strftime("%Y.%m")}"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record)
     end
@@ -4563,6 +5136,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     time = Time.parse Date.today.iso8601
     logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m")}"
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(time.to_i, sample_record)
     end
@@ -4589,6 +5163,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   def test_doesnt_add_logstash_timestamp_by_default
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4598,6 +5173,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_adds_timestamp_when_logstash
     driver.configure("logstash_format true\n")
     stub_elastic
+    stub_elastic_info
     ts = DateTime.now
     time = Fluent::EventTime.from_time(ts.to_time)
     driver.run(default_tag: 'test') do
@@ -4610,6 +5186,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_adds_timestamp_when_include_timestamp
     driver.configure("include_timestamp true\n")
     stub_elastic
+    stub_elastic_info
     ts = DateTime.now
     time = Fluent::EventTime.from_time(ts.to_time)
     driver.run(default_tag: 'test') do
@@ -4622,6 +5199,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_uses_custom_timestamp_when_included_in_record
     driver.configure("logstash_format true\n")
     stub_elastic
+    stub_elastic_info
     ts = DateTime.new(2001,2,3).iso8601
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('@timestamp' => ts))
@@ -4633,6 +5211,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_uses_custom_timestamp_when_included_in_record_without_logstash
     driver.configure("include_timestamp true\n")
     stub_elastic
+    stub_elastic_info
     ts = DateTime.new(2001,2,3).iso8601
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('@timestamp' => ts))
@@ -4645,6 +5224,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("logstash_format true
                       time_key vtm\n")
     stub_elastic
+    stub_elastic_info
     ts = DateTime.new(2001,2,3).iso8601(9)
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('vtm' => ts))
@@ -4658,6 +5238,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       time_precision 3
                       time_key vtm\n")
     stub_elastic
+    stub_elastic_info
     time = Time.now
     float_time = time.to_f
     driver.run(default_tag: 'test') do
@@ -4672,6 +5253,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       time_key_format %Y-%m-%d %H:%M:%S.%N%z
                       time_key vtm\n")
     stub_elastic
+    stub_elastic_info
     ts = "2001-02-03 13:14:01.673+02:00"
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('vtm' => ts))
@@ -4686,6 +5268,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       time_key_format %Y-%m-%d %H:%M:%S.%N%z
                       time_key vtm\n")
     stub_elastic
+    stub_elastic_info
     ts = "2001-02-03 13:14:01.673+02:00"
     time = Time.parse(ts)
     current_zone_offset = Time.new(2001, 02, 03).to_datetime.offset
@@ -4703,6 +5286,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       time_key_format %Y-%m-%d %H:%M:%S.%N%z
                       time_key vtm\n")
     stub_elastic
+    stub_elastic_info
     ts = "2001-02-03 13:14:01.673+02:00"
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('vtm' => ts))
@@ -4717,6 +5301,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       time_key vtm
                       time_key_exclude_timestamp true\n")
     stub_elastic
+    stub_elastic_info
     ts = DateTime.new(2001,2,3).iso8601
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('vtm' => ts))
@@ -4728,6 +5313,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("logstash_format true
                       time_key_format %Y-%m-%dT%H:%M:%S.%N%z\n")
     stub_elastic
+    stub_elastic_info
     ts = "2001-02-03T13:14:01.673+02:00"
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('@timestamp' => ts))
@@ -4742,6 +5328,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       index_name test
                       time_key_format %Y-%m-%dT%H:%M:%S.%N%z\n")
     stub_elastic
+    stub_elastic_info
     ts = "2001-02-03T13:14:01.673+02:00"
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('@timestamp' => ts))
@@ -4759,6 +5346,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("logstash_format true
                       time_key_format %Y-%m-%dT%H:%M:%S.%N%z\n#{tag_config}\n")
     stub_elastic
+    stub_elastic_info
 
     ts = "2001/02/03 13:14:01,673+02:00"
     index = "logstash-#{Time.now.getutc.strftime("%Y.%m.%d")}"
@@ -4779,6 +5367,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("logstash_format true
                       time_key_format %a %b %d %H:%M:%S %Z %Y\n")
     stub_elastic
+    stub_elastic_info
     ts = "Thu Nov 29 14:33:20 GMT 2001"
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge!('@timestamp' => ts))
@@ -4791,6 +5380,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_uses_nanosecond_precision_by_default
     driver.configure("logstash_format true\n")
     stub_elastic
+    stub_elastic_info
     time = Fluent::EventTime.new(Time.now.to_i, 123456789)
     driver.run(default_tag: 'test') do
       driver.feed(time, sample_record)
@@ -4803,6 +5393,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("logstash_format true
                       time_precision 3\n")
     stub_elastic
+    stub_elastic_info
     time = Fluent::EventTime.new(Time.now.to_i, 123456789)
     driver.run(default_tag: 'test') do
       driver.feed(time, sample_record)
@@ -4813,6 +5404,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   def test_doesnt_add_tag_key_by_default
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4822,6 +5414,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_adds_tag_key_when_configured
     driver.configure("include_tag_key true\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'mytag') do
       driver.feed(sample_record)
     end
@@ -4832,6 +5425,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_adds_id_key_when_configured
     driver.configure("id_key request_id\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4842,6 +5436,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_adds_nested_id_key_with_dot
       driver.configure("id_key nested.request_id\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
@@ -4851,6 +5446,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_adds_nested_id_key_with_dollar_dot
       driver.configure("id_key $.nested.request_id\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
@@ -4860,6 +5456,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_adds_nested_id_key_with_bracket
       driver.configure("id_key $['nested']['request_id']\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
@@ -4870,6 +5467,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_doesnt_add_id_key_if_missing_when_configured
     driver.configure("id_key another_request_id\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4878,6 +5476,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   def test_adds_id_key_when_not_configured
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4887,6 +5486,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_adds_parent_key_when_configured
     driver.configure("parent_key parent_id\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4897,6 +5497,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_adds_nested_parent_key_with_dot
       driver.configure("parent_key nested.parent_id\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
@@ -4906,6 +5507,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_adds_nested_parent_key_with_dollar_dot
       driver.configure("parent_key $.nested.parent_id\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
@@ -4915,6 +5517,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_adds_nested_parent_key_with_bracket
       driver.configure("parent_key $['nested']['parent_id']\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
@@ -4925,6 +5528,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_doesnt_add_parent_key_if_missing_when_configured
     driver.configure("parent_key another_parent_id\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4933,6 +5537,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   def test_adds_parent_key_when_not_configured
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -4943,19 +5548,23 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_es6
       driver("routing_key routing_id\n", 6)
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)
       end
-      assert_equal('routing', index_cmds[0]['index']['_routing'])
+      routing_key = driver.instance.instance_variable_get(:@routing_key_name)
+      assert_equal('routing', index_cmds[0]['index'][routing_key])
     end
 
     def test_es7
       driver("routing_key routing_id\n", 7)
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)
       end
-      assert_equal('routing', index_cmds[0]['index']['routing'])
+      routing_key = driver.instance.instance_variable_get(:@routing_key_name)
+      assert_equal('routing', index_cmds[0]['index'][routing_key])
     end
   end
 
@@ -4963,51 +5572,62 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     def test_adds_nested_routing_key_with_dot
       driver.configure("routing_key nested.routing_id\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
-      assert_equal('routing', index_cmds[0]['index']['_routing'])
+      routing_key = driver.instance.instance_variable_get(:@routing_key_name)
+      assert_equal('routing', index_cmds[0]['index'][routing_key])
     end
 
     def test_adds_nested_routing_key_with_dollar_dot
       driver.configure("routing_key $.nested.routing_id\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
-      assert_equal('routing', index_cmds[0]['index']['_routing'])
+      routing_key = driver.instance.instance_variable_get(:@routing_key_name)
+      assert_equal('routing', index_cmds[0]['index'][routing_key])
     end
 
     def test_adds_nested_routing_key_with_bracket
       driver.configure("routing_key $['nested']['routing_id']\n")
       stub_elastic
+      stub_elastic_info
       driver.run(default_tag: 'test') do
         driver.feed(nested_sample_record)
       end
-      assert_equal('routing', index_cmds[0]['index']['_routing'])
+      routing_key = driver.instance.instance_variable_get(:@routing_key_name)
+      assert_equal('routing', index_cmds[0]['index'][routing_key])
     end
   end
 
   def test_doesnt_add_routing_key_if_missing_when_configured
     driver.configure("routing_key another_routing_id\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
-    assert(!index_cmds[0]['index'].has_key?('_routing'))
+    routing_key = driver.instance.instance_variable_get(:@routing_key_name)
+    assert(!index_cmds[0]['index'].has_key?(routing_key))
   end
 
   def test_adds_routing_key_when_not_configured
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
-    assert(!index_cmds[0]['index'].has_key?('_routing'))
+    routing_key = driver.instance.instance_variable_get(:@routing_key_name)
+    assert(!index_cmds[0]['index'].has_key?(routing_key))
   end
 
   def test_remove_one_key
     driver.configure("remove_keys key1\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge('key1' => 'v1', 'key2' => 'v2'))
     end
@@ -5018,6 +5638,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_remove_multi_keys
     driver.configure("remove_keys key1, key2\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record.merge('key1' => 'v1', 'key2' => 'v2'))
     end
@@ -5026,6 +5647,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   end
 
   def test_request_error
+    stub_elastic_info
     stub_elastic_unavailable
     assert_raise(Fluent::Plugin::ElasticsearchOutput::RecoverableRequestFailure) {
       driver.run(default_tag: 'test', shutdown: false) do
@@ -5037,6 +5659,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_request_forever
     omit("retry_forever test is unstable.") if ENV["CI"]
     stub_elastic
+    stub_elastic_info
     driver.configure(Fluent::Config::Element.new(
                'ROOT', '', {
                  '@type' => 'elasticsearch',
@@ -5061,6 +5684,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       connection_resets += 1
       raise Faraday::ConnectionFailed, "Test message"
     end
+    stub_elastic_info
 
     assert_raise(Fluent::Plugin::ElasticsearchOutput::RecoverableRequestFailure) {
       driver.run(default_tag: 'test', shutdown: false) do
@@ -5077,6 +5701,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       connection_resets += 1
       raise ZeroDivisionError, "any not host_unreachable_exceptions exception"
     end
+    stub_elastic_info
 
     driver.configure("reconnect_on_error true\n")
 
@@ -5103,6 +5728,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       connection_resets += 1
       raise ZeroDivisionError, "any not host_unreachable_exceptions exception"
     end
+    stub_elastic_info
 
     driver.configure("reconnect_on_error false\n")
 
@@ -5146,6 +5772,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         })
      }
     end)
+    stub_elastic_info
 
     driver.run(default_tag: 'test') do
       driver.feed(1, sample_record)
@@ -5217,6 +5844,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         })
                      }
                    end)
+      stub_elastic_info
 
       # Check buffer fulfillment condition
       assert_raise(Fluent::Plugin::ElasticsearchOutput::RetryStreamEmitFailure) do
@@ -5263,6 +5891,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         })
      }
     end)
+    stub_elastic_info
+
     sample_record1 = sample_record('my_id' => 'abc')
     sample_record4 = sample_record('my_id' => 'xyz')
 
@@ -5312,6 +5942,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         })
      }
     end)
+    stub_elastic_info
+
     sample_record1 = sample_record('my_id' => 'abc')
     sample_record4 = sample_record('my_id' => 'xyz')
 
@@ -5382,6 +6014,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         })
      }
     end)
+    stub_elastic_info
 
     driver.run(default_tag: 'test') do
       driver.feed(1, sample_record)
@@ -5398,6 +6031,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_update_should_not_write_if_theres_no_id
     driver.configure("write_operation update\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5407,6 +6041,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_upsert_should_not_write_if_theres_no_id
     driver.configure("write_operation upsert\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5416,6 +6051,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_create_should_not_write_if_theres_no_id
     driver.configure("write_operation create\n")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5426,6 +6062,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("write_operation update
                       id_key request_id")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5439,6 +6076,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       id_key request_id
                       remove_keys_on_update parent_id")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5450,6 +6088,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("write_operation upsert
                       id_key request_id")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5463,6 +6102,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       id_key request_id
                       remove_keys_on_update parent_id")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5477,6 +6117,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       id_key request_id
                       remove_keys_on_update parent_id")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5490,6 +6131,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       id_key id
                       remove_keys_on_update foo,baz")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed("id" => 1, "foo" => "bar", "baz" => "quix", "zip" => "zam")
     end
@@ -5514,6 +6156,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       id_key id
                       remove_keys_on_update_key keys_to_skip")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed("id" => 1, "foo" => "bar", "baz" => "quix", "keys_to_skip" => ["baz"])
     end
@@ -5538,6 +6181,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       remove_keys_on_update foo,bar
                       remove_keys_on_update_key keys_to_skip")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed("id" => 1, "foo" => "bar", "baz" => "quix", "keys_to_skip" => ["baz"])
     end
@@ -5562,6 +6206,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     driver.configure("write_operation create
                       id_key request_id")
     stub_elastic
+    stub_elastic_info
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -5570,6 +6215,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   def test_include_index_in_url
     stub_elastic('http://localhost:9200/logstash-2018.01.01/_bulk')
+    stub_elastic_info('http://localhost:9200/')
 
     driver.configure("index_name logstash-2018.01.01
                       include_index_in_url true")
@@ -5583,8 +6229,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
   def test_use_simple_sniffer
     require 'fluent/plugin/elasticsearch_simple_sniffer'
-    stub_elastic_info
     stub_elastic
+    stub_elastic_info
     config = %[
       sniffer_class_name Fluent::Plugin::ElasticsearchSimpleSniffer
       log_level debug
@@ -5608,6 +6254,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       remove_keys id
                       suppress_doc_wrap true')
     stub_elastic
+    stub_elastic_info
     doc_body = {'field' => 'value'}
     script_body = {'source' => 'ctx._source.counter += params.param1',
                    'lang' => 'painless',
@@ -5634,6 +6281,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
                       remove_keys id
                       suppress_doc_wrap true')
     stub_elastic
+    stub_elastic_info
     doc_body = {'field' => 'value'}
     script_body = {'source' => 'ctx._source.counter += params.param1',
                    'lang' => 'painless',
@@ -5658,8 +6306,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   end
 
   def test_ignore_exception
-    driver.configure('ignore_exceptions ["Elasticsearch::Transport::Transport::Errors::ServiceUnavailable"]')
+    ignore_classes = if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+                     ["Elastic::Transport::Transport::Errors::ServiceUnavailable"]
+                   else
+                     ["Elasticsearch::Transport::Transport::Errors::ServiceUnavailable"]
+                   end
+    driver.configure("ignore_exceptions #{ignore_classes}")
     stub_elastic_unavailable
+    stub_elastic_info
 
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
@@ -5667,8 +6321,14 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   end
 
   def test_ignore_exception_with_superclass
-    driver.configure('ignore_exceptions ["Elasticsearch::Transport::Transport::ServerError"]')
+    ignore_classes = if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+                       ["Elastic::Transport::Transport::Errors::ServiceUnavailable"]
+                     else
+                       ["Elasticsearch::Transport::Transport::Errors::ServiceUnavailable"]
+                     end
+    driver.configure("ignore_exceptions #{ignore_classes}")
     stub_elastic_unavailable
+    stub_elastic_info
 
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
@@ -5678,6 +6338,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   def test_ignore_excetion_handles_appropriate_ones
     driver.configure('ignore_exceptions ["Faraday::ConnectionFailed"]')
     stub_elastic_unavailable
+    stub_elastic_info
 
     assert_raise(Fluent::Plugin::ElasticsearchOutput::RecoverableRequestFailure) {
       driver.run(default_tag: 'test', shutdown: false) do