fluent-plugin-elasticsearch 4.1.2 → 4.2.2

data/test/plugin/test_elasticsearch_tls.rb

@@ -62,8 +62,14 @@ class TestElasticsearchTLS < Test::Unit::TestCase
       d = driver('')
       ssl_version_options = d.instance.set_tls_minmax_version_config(d.instance.ssl_version, nil, nil)
       if @use_tls_minmax_version
-        assert_equal({max_version: OpenSSL::SSL::TLS1_3_VERSION,
-                      min_version: OpenSSL::SSL::TLS1_2_VERSION}, ssl_version_options)
+        if @enabled_tlsv1_3
+          assert_equal({max_version: OpenSSL::SSL::TLS1_3_VERSION,
+                        min_version: OpenSSL::SSL::TLS1_2_VERSION}, ssl_version_options)
+        else
+          assert_equal({max_version: nil,
+                        min_version: OpenSSL::SSL::TLS1_2_VERSION}, ssl_version_options)
+
+        end
       else
         assert_equal({version: Fluent::Plugin::ElasticsearchTLS::DEFAULT_VERSION}, ssl_version_options)
       end

data/test/plugin/test_in_elasticsearch.rb

@@ -20,6 +20,11 @@ class ElasticsearchInputTest < Test::Unit::TestCase
     @driver = nil
     log = Fluent::Engine.log
     log.out.logs.slice!(0, log.out.logs.length)
+    @http_method = if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("7.9.0")
+                     :post
+                   else
+                     :get
+                   end
   end
 
   def driver(conf='')
@@ -313,7 +318,7 @@ class ElasticsearchInputTest < Test::Unit::TestCase
   end
 
   def test_emit
-    stub_request(:get, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
+    stub_request(@http_method, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
       with(body: "{\"sort\":[\"_doc\"]}").
       to_return(status: 200, body: sample_response.to_s,
                 headers: {'Content-Type' => 'application/json'})
@@ -328,7 +333,7 @@ class ElasticsearchInputTest < Test::Unit::TestCase
 
   def test_emit_with_custom_index_name
     index_name = "logstash"
-    stub_request(:get, "http://localhost:9200/#{index_name}/_search?scroll=1m&size=1000").
+    stub_request(@http_method, "http://localhost:9200/#{index_name}/_search?scroll=1m&size=1000").
       with(body: "{\"sort\":[\"_doc\"]}").
       to_return(status: 200, body: sample_response(index_name).to_s,
                 headers: {'Content-Type' => 'application/json'})
@@ -343,7 +348,7 @@ class ElasticsearchInputTest < Test::Unit::TestCase
 
   def test_emit_with_parse_timestamp
     index_name = "fluentd"
-    stub_request(:get, "http://localhost:9200/#{index_name}/_search?scroll=1m&size=1000").
+    stub_request(@http_method, "http://localhost:9200/#{index_name}/_search?scroll=1m&size=1000").
       with(body: "{\"sort\":[\"_doc\"]}").
       to_return(status: 200, body: sample_response(index_name).to_s,
                 headers: {'Content-Type' => 'application/json'})
@@ -361,7 +366,7 @@ class ElasticsearchInputTest < Test::Unit::TestCase
 
   def test_emit_with_parse_timestamp_and_timstamp_format
     index_name = "fluentd"
-    stub_request(:get, "http://localhost:9200/#{index_name}/_search?scroll=1m&size=1000").
+    stub_request(@http_method, "http://localhost:9200/#{index_name}/_search?scroll=1m&size=1000").
       with(body: "{\"sort\":[\"_doc\"]}").
       to_return(status: 200, body: sample_response(index_name).to_s,
                 headers: {'Content-Type' => 'application/json'})
@@ -380,7 +385,7 @@ class ElasticsearchInputTest < Test::Unit::TestCase
   end
 
   def test_emit_with_docinfo
-    stub_request(:get, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
+    stub_request(@http_method, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
       with(body: "{\"sort\":[\"_doc\"]}").
       to_return(status: 200, body: sample_response.to_s,
                 headers: {'Content-Type' => 'application/json'})
@@ -399,11 +404,11 @@ class ElasticsearchInputTest < Test::Unit::TestCase
   end
 
   def test_emit_with_slices
-    stub_request(:get, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
+    stub_request(@http_method, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
       with(body: "{\"sort\":[\"_doc\"],\"slice\":{\"id\":0,\"max\":2}}").
       to_return(status: 200, body: sample_response.to_s,
                 headers: {'Content-Type' => 'application/json'})
-    stub_request(:get, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
+    stub_request(@http_method, "http://localhost:9200/fluentd/_search?scroll=1m&size=1000").
       with(body: "{\"sort\":[\"_doc\"],\"slice\":{\"id\":1,\"max\":2}}").
       to_return(status: 200, body: sample_response.to_s,
                 headers: {'Content-Type' => 'application/json'})
@@ -419,12 +424,12 @@ class ElasticsearchInputTest < Test::Unit::TestCase
   end
 
   def test_emit_with_size
-    stub_request(:get, "http://localhost:9200/fluentd/_search?scroll=1m&size=1").
+    stub_request(@http_method, "http://localhost:9200/fluentd/_search?scroll=1m&size=1").
       with(body: "{\"sort\":[\"_doc\"]}").
       to_return(status: 200, body: sample_scroll_response.to_s,
                 headers: {'Content-Type' => 'application/json'})
     connection = 0
-    scroll_request = stub_request(:get, "http://localhost:9200/_search/scroll?scroll=1m").
+    scroll_request = stub_request(@http_method, "http://localhost:9200/_search/scroll?scroll=1m").
       with(
         body: "{\"scroll_id\":\"WomkoUKG0QPB679Ulo6TqQgh3pIGRUmrl9qXXGK3EeiQh9rbYNasTkspZQcJ01uz\"}") do
       connection += 1

data/test/plugin/test_index_alias_template.json

@@ -0,0 +1,11 @@
+{
+  "priority": 105,
+  "index_patterns": "--index_prefix-----appid---*",
+  "template" : {
+    "settings": {},
+    "mappings": {},
+    "aliases": {
+      "--appid---alias": {}
+    }
+  }
+}

data/test/plugin/test_index_template.json

@@ -0,0 +1,25 @@
+{
+  "index_patterns": "te*",
+  "template": {
+    "settings": {
+      "number_of_shards": 1
+    },
+    "mappings": {
+      "type1": {
+        "_source": {
+          "enabled": false
+        },
+        "properties": {
+          "host_name": {
+            "type": "string",
+            "index": "not_analyzed"
+          },
+          "created_at": {
+            "type": "date",
+            "format": "EEE MMM dd HH:mm:ss Z YYYY"
+          }
+        }
+      }
+    }
+  }
+}

data/test/plugin/test_out_elasticsearch.rb

@@ -230,8 +230,13 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_nil instance.ssl_max_version
     assert_nil instance.ssl_min_version
     if Fluent::Plugin::ElasticsearchTLS::USE_TLS_MINMAX_VERSION
-      assert_equal({max_version: OpenSSL::SSL::TLS1_3_VERSION, min_version: OpenSSL::SSL::TLS1_2_VERSION},
-                   instance.ssl_version_options)
+      if defined?(OpenSSL::SSL::TLS1_3_VERSION)
+        assert_equal({max_version: OpenSSL::SSL::TLS1_3_VERSION, min_version: OpenSSL::SSL::TLS1_2_VERSION},
+                     instance.ssl_version_options)
+      else
+        assert_equal({max_version: nil, min_version: OpenSSL::SSL::TLS1_2_VERSION},
+                     instance.ssl_version_options)
+      end
     else
       assert_equal({version: Fluent::Plugin::ElasticsearchTLS::DEFAULT_VERSION},
                    instance.ssl_version_options)
@@ -252,6 +257,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_false instance.compression
     assert_equal :no_compression, instance.compression_level
     assert_true instance.http_backend_excon_nonblock
+    assert_equal({}, instance.api_key_header)
   end
 
   test 'configure compression' do
@@ -374,7 +380,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       end
     end
 
-    test 'valid configuration of index lifecycle management' do
+    data("legacy_template" => [true, "_template"],
+         "new_template"    => [false, "_index_template"])
+    test 'valid configuration of index lifecycle management' do |data|
+      use_legacy_template_flag, endpoint = data
       cwd = File.dirname(__FILE__)
       template_file = File.join(cwd, 'test_template.json')
 
@@ -382,8 +391,9 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         enable_ilm    true
         template_name logstash
         template_file #{template_file}
+        use_legacy_template #{use_legacy_template_flag}
       }
-      stub_request(:get, "http://localhost:9200/_template/fluentd").
+      stub_request(:get, "http://localhost:9200/#{endpoint}/fluentd").
         to_return(status: 200, body: "", headers: {})
       stub_request(:head, "http://localhost:9200/_alias/fluentd").
         to_return(status: 404, body: "", headers: {})
@@ -406,7 +416,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       }
     end
 
-    test 'valid configuration of overwriting ilm_policy' do
+    data("legacy_template" => [true, "_template"],
+         "new_template"    => [false, "_index_template"])
+    test 'valid configuration of overwriting ilm_policy' do |data|
+      use_legacy_template_flag, endpoint = data
       cwd = File.dirname(__FILE__)
       template_file = File.join(cwd, 'test_template.json')
 
@@ -416,8 +429,9 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         template_file #{template_file}
         ilm_policy_overwrite true
         ilm_policy {"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"75gb","max_age": "50d"}}}}}}
+        use_legacy_template #{use_legacy_template_flag}
       }
-      stub_request(:get, "http://localhost:9200/_template/fluentd").
+      stub_request(:get, "http://localhost:9200/#{endpoint}/fluentd").
         to_return(status: 200, body: "", headers: {})
       stub_request(:head, "http://localhost:9200/_alias/fluentd").
         to_return(status: 404, body: "", headers: {})
@@ -805,7 +819,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
   end
 
-  def test_template_already_present
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_template_already_present(data)
+    use_legacy_template_flag, endpoint = data
     config = %{
       host            logs.google.com
       port            777
@@ -815,6 +832,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       password        doe
       template_name   logstash
       template_file   /abc123
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -822,18 +840,25 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_not_requested(:put, "https://logs.google.com:777/es//_template/logstash")
+    assert_not_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash")
   end
 
-  def test_template_create
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_template_create(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -844,6 +869,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       password        doe
       template_name   logstash
       template_file   #{template_file}
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -851,22 +877,29 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
   end
 
-  def test_template_create_with_rollover_index_and_template_related_placeholders
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_template_create_with_rollover_index_and_template_related_placeholders(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
    config = %{
       host               logs.google.com
       port               777
@@ -880,6 +913,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       index_date_pattern ""
       index_name         fluentd-${tag}
       deflector_alias    myapp_deflector-${tag}
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -887,11 +921,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
     to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash-test.template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash-test.template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # create template
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash-test.template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-test.template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if alias exists
@@ -921,9 +955,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_requested(elastic_request)
   end
 
-  def test_template_create_with_rollover_index_and_template_related_placeholders_with_truncating_caches
+  data("legacy_template" => [true, "_template"],
+       "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
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
     config = %{
       host               logs.google.com
       port               777
@@ -938,6 +979,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       index_name         fluentd-${tag}
       deflector_alias    myapp_deflector-${tag}
       truncate_caches_interval 2s
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -945,11 +987,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
     to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash-test.template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash-test.template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # create template
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash-test.template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-test.template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if alias exists
@@ -994,9 +1036,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       end
     end
 
-    def test_template_create_with_rollover_index_and_default_ilm
+    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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -1010,6 +1059,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         index_date_pattern now/w{xxxx.ww}
         index_name      logstash
         enable_ilm      true
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -1017,24 +1067,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
       stub_request(:head, "https://logs.google.com:777/es//_alias/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-*\",\"order\":51}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-*\",\"order\":51}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":101}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
         with(basic_auth: ['john', 'doe']).
@@ -1056,12 +1113,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       driver(config)
 
-      assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
     end
 
-    def test_template_create_with_rollover_index_and_default_ilm_on_logstash_format
+    data("legacy_template" => [true, "_template"],
+         "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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -1076,6 +1140,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         enable_ilm      true
         logstash_format true
         application_name log
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       date_str = Time.now.strftime("%Y.%m.%d")
@@ -1084,24 +1149,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash-#{date_str}").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash-#{date_str}").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash-#{date_str}").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-#{date_str}").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
       stub_request(:head, "https://logs.google.com:777/es//_alias/logstash-#{date_str}").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash-#{date_str}").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash-#{date_str}").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash-#{date_str}").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-log-#{date_str}\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-log-#{date_str}-*\",\"order\":53}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-#{date_str}").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-log-#{date_str}\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-log-#{date_str}-*\",\"order\":53}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-#{date_str}").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-log-2020.09.21-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-2020.09.21\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":103}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-log-#{date_str}-000001%3E").
         with(basic_auth: ['john', 'doe']).
@@ -1128,14 +1200,21 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)
       end
-      assert_requested(:put, "https://logs.google.com:777/es//_template/logstash-#{date_str}", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-#{date_str}", times: 1)
 
       assert_requested(elastic_request)
     end
 
-    def test_template_create_with_rollover_index_and_default_ilm_and_ilm_policy_overwrite
+    data("legacy_template" => [true, "_template"],
+         "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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -1151,6 +1230,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         enable_ilm      true
         ilm_policy_overwrite true
         ilm_policy {"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"60gb","max_age": "45d"}}}}}}
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -1158,24 +1238,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
       stub_request(:head, "https://logs.google.com:777/es//_alias/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-*\",\"order\":51}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-*\",\"order\":51}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":101}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
         with(basic_auth: ['john', 'doe']).
@@ -1197,7 +1284,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       driver(config)
 
-      assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
     end
 
     def test_template_create_with_rollover_index_and_default_ilm_with_deflector_alias
@@ -1225,9 +1312,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       end
     end
 
-    def test_template_create_with_rollover_index_and_default_ilm_with_empty_index_date_pattern
+    data("legacy_template" => [true, "_template"],
+         "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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -1241,6 +1335,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         index_date_pattern ""
         index_name      logstash
         enable_ilm      true
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -1248,24 +1343,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
       stub_request(:head, "https://logs.google.com:777/es//_alias/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/myapp_deflector").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-*\",\"order\":51}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_deflector").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-*\",\"order\":51}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_deflector").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":101}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-default-000001%3E").
         with(basic_auth: ['john', 'doe']).
@@ -1287,12 +1389,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       driver(config)
 
-      assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
     end
 
-    def test_template_create_with_rollover_index_and_custom_ilm
+    data("legacy_template" => [true, "_template"],
+         "new_template"    => [false, "_index_template"])
+    def test_template_create_with_rollover_index_and_custom_ilm(data)
+      use_legacy_template_flag, endpoint = data
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -1308,6 +1417,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         enable_ilm      true
         index_name      logstash
         ilm_policy      {"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"70gb", "max_age":"30d"}}}}}}
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -1315,24 +1425,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
       stub_request(:head, "https://logs.google.com:777/es//_alias/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"myalogs\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"mylogs-*\",\"order\":51}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"myalogs\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"mylogs-*\",\"order\":51}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":101}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
         with(basic_auth: ['john', 'doe']).
@@ -1353,12 +1470,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       driver(config)
 
-      assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
     end
 
-    def test_template_create_with_rollover_index_and_ilm_policies_and_placeholders
+    data("legacy_template" => [true, "_template"],
+         "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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -1374,6 +1498,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         enable_ilm      true
         index_name      logstash
         ilm_policies    {"fluentd-policy":{"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"70gb", "max_age":"30d"}}}}}}}
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -1381,24 +1506,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
       stub_request(:head, "https://logs.google.com:777/es//_alias/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"myalogs\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"mylogs-*\",\"order\":51}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"myalogs\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"mylogs-*\",\"order\":51}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":101}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
         with(basic_auth: ['john', 'doe']).
@@ -1423,15 +1555,22 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)
       end
-      assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
 
       assert_requested(elastic_request)
     end
 
     class TemplateCreateWithRolloverIndexAndILMPoliciesWithPlaceholdersTest < self
-      def test_tag_placeholder
+      data("legacy_template" => [true, "_template"],
+           "new_template"    => [false, "_index_template"])
+      def test_tag_placeholder(data)
+        use_legacy_template_flag, endpoint = data
         cwd = File.dirname(__FILE__)
-        template_file = File.join(cwd, 'test_template.json')
+        template_file = if use_legacy_template_flag
+                          File.join(cwd, 'test_template.json')
+                        else
+                          File.join(cwd, 'test_index_template.json')
+                        end
 
         config = %{
           host            logs.google.com
@@ -1447,6 +1586,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
           enable_ilm      true
           index_name      logstash
           ilm_policies    {"fluentd-policy":{"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"70gb", "max_age":"30d"}}}}}}}
+          use_legacy_template #{use_legacy_template_flag}
         }
 
         # connection start
@@ -1454,24 +1594,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 200, :body => "", :headers => {})
         # check if template exists
-        stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+        stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 404, :body => "", :headers => {})
         # creation
-        stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 200, :body => "", :headers => {})
         # check if alias exists
         stub_request(:head, "https://logs.google.com:777/es//_alias/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 404, :body => "", :headers => {})
-        stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+        stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(status: 404, body: "", headers: {})
-        stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
-          with(basic_auth: ['john', 'doe'],
-               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"myalogs\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"mylogs-*\",\"order\":51}").
-          to_return(status: 200, body: "", headers: {})
+        if use_legacy_template_flag
+          stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+            with(basic_auth: ['john', 'doe'],
+                 body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"myalogs\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"mylogs-*\",\"order\":51}").
+            to_return(status: 200, body: "", headers: {})
+        else
+          stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+            with(basic_auth: ['john', 'doe'],
+                 body: "{\"index_patterns\":\"logstash-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":101}").
+            to_return(status: 200, body: "", headers: {})
+        end
         # put the alias for the index
         stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
           with(basic_auth: ['john', 'doe']).
@@ -1496,14 +1643,21 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         driver.run(default_tag: 'fluentd-policy') do
           driver.feed(sample_record)
         end
-        assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+        assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
 
         assert_requested(elastic_request)
       end
 
-      def test_tag_placeholder_with_multiple_policies
+      data("legacy_template" => [true, "_template"],
+           "new_template"    => [false, "_index_template"])
+      def test_tag_placeholder_with_multiple_policies(data)
+        use_legacy_template_flag, endpoint = data
         cwd = File.dirname(__FILE__)
-        template_file = File.join(cwd, 'test_template.json')
+        template_file = if use_legacy_template_flag
+                          File.join(cwd, 'test_template.json')
+                        else
+                          File.join(cwd, 'test_index_template.json')
+                        end
 
         config = %{
           host            logs.google.com
@@ -1519,6 +1673,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
           enable_ilm      true
           index_name      logstash
           ilm_policies    {"fluentd-policy":{"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"70gb", "max_age":"30d"}}}}}}, "fluentd-policy2":{"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"80gb", "max_age":"20d"}}}}}}}
+          use_legacy_template #{use_legacy_template_flag}
         }
 
         # connection start
@@ -1526,24 +1681,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 200, :body => "", :headers => {})
         # check if template exists
-        stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+        stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 404, :body => "", :headers => {})
         # creation
-        stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 200, :body => "", :headers => {})
         # check if alias exists
         stub_request(:head, "https://logs.google.com:777/es//_alias/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(:status => 404, :body => "", :headers => {})
-        stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+        stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
           with(basic_auth: ['john', 'doe']).
           to_return(status: 404, body: "", headers: {})
-        stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
-          with(basic_auth: ['john', 'doe'],
-               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"myalogs\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"mylogs-*\",\"order\":51}").
-          to_return(status: 200, body: "", headers: {})
+        if use_legacy_template_flag
+          stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+            with(basic_auth: ['john', 'doe'],
+                 body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy2\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-*\",\"order\":51}").
+            to_return(status: 200, body: "", headers: {})
+        else
+          stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+            with(basic_auth: ['john', 'doe'],
+                 body: "{\"index_patterns\":\"logstash-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"fluentd-policy2\",\"index.lifecycle.rollover_alias\":\"logstash\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":101}").
+            to_return(status: 200, body: "", headers: {})
+        end
         # put the alias for the index
         stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
           with(basic_auth: ['john', 'doe']).
@@ -1568,15 +1730,22 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         driver.run(default_tag: 'fluentd-policy2') do
           driver.feed(sample_record)
         end
-        assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+        assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
 
         assert_requested(elastic_request)
       end
     end
 
-    def test_template_create_with_rollover_index_and_default_ilm_and_placeholders
+    data("legacy_template" => [true, "_template"],
+         "new_template"    => [false, "_index_template"])
+    def test_template_create_with_rollover_index_and_default_ilm_and_placeholders(data)
+      use_legacy_template_flag, endpoint = data
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -1590,6 +1759,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         index_date_pattern now/w{xxxx.ww}
         index_name logstash-${tag}
         enable_ilm      true
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -1597,31 +1767,166 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
-      stub_request(:head, "https://logs.google.com:777/es//_alias/logstash-test").
+      stub_request(:head, "https://logs.google.com:777/es//_alias/logstash-tag1").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/logstash-test").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash-tag1").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/logstash-test").
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-tag1").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-tag1\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-tag1-*\",\"order\":52}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-tag1").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-tag1-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-tag1\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":102}").
+          to_return(status: 200, body: "", headers: {})
+      end
+      # put the alias for the index
+      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-tag1-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 200, :body => "", :headers => {})
+      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-tag1-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/logstash-tag1").
         with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-test\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-test-*\",\"order\":52}").
-        to_return(status: 200, body: "", headers: {})
+             :body => "{\"aliases\":{\"logstash-tag1\":{\"is_write_index\":true}}}").
+        to_return(:status => 200, :body => "", :headers => {})
+      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").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      stub_request(:put, "https://logs.google.com:777/es//_ilm/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 => {})
+      # check if alias exists
+      stub_request(:head, "https://logs.google.com:777/es//_alias/logstash-tag2").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash-tag2").
+        with(basic_auth: ['john', 'doe']).
+        to_return(status: 404, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-tag2").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-tag2\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash-tag2-*\",\"order\":52}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash-tag2").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash-tag2-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash-tag2\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":102}").
+          to_return(status: 200, body: "", headers: {})
+      end      # put the alias for the index
+      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-tag2-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 200, :body => "", :headers => {})
+      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-tag2-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/logstash-tag2").
+        with(basic_auth: ['john', 'doe'],
+             :body => "{\"aliases\":{\"logstash-tag2\":{\"is_write_index\":true}}}").
+        to_return(:status => 200, :body => "", :headers => {})
+      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").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      stub_request(:put, "https://logs.google.com:777/es//_ilm/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 => {})
+
+      driver(config)
+
+      elastic_request = stub_elastic("https://logs.google.com:777/es//_bulk")
+      driver.run(default_tag: 'test') do
+        driver.feed('tag1', event_time, sample_record)
+        driver.feed('tag2', event_time, sample_record)
+        driver.feed('tag1', event_time, sample_record)
+        driver.feed('tag2', event_time, sample_record)
+      end
+      assert_equal('logstash-tag2', index_cmds.first['index']['_index'])
+
+      assert_equal ["logstash-tag1", "logstash-tag2"], driver.instance.alias_indexes
+
+      assert_requested(elastic_request)
+    end
+
+
+    data("legacy_template" => [true, "_template"],
+         "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
+      cwd = File.dirname(__FILE__)
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
+
+      config = %{
+        host            logs.google.com
+        port            777
+        scheme          https
+        path            /es/
+        user            john
+        password        doe
+        template_name   logstash
+        template_file   #{template_file}
+        index_date_pattern now/w{xxxx.ww}
+        index_name logstash.${tag}
+        enable_ilm      true
+        index_separator "."
+        use_legacy_template #{use_legacy_template_flag}
+      }
+
+      # connection start
+      stub_request(:head, "https://logs.google.com:777/es//").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 200, :body => "", :headers => {})
+      # check if template exists
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      # creation
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 200, :body => "", :headers => {})
+      # check if alias exists
+      stub_request(:head, "https://logs.google.com:777/es//_alias/logstash.tag1").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash.tag1").
+        with(basic_auth: ['john', 'doe']).
+        to_return(status: 404, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash.tag1").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash.tag1\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"logstash.tag1.*\",\"order\":52}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash.tag1").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"logstash.tag1.*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"logstash.tag1\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":102}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
-      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-test-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
+      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash.tag1.default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash-test-default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/logstash-test").
+      stub_request(:put, "https://logs.google.com:777/es//%3Clogstash.tag1.default-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/logstash.tag1").
         with(basic_auth: ['john', 'doe'],
-             :body => "{\"aliases\":{\"logstash-test\":{\"is_write_index\":true}}}").
+             :body => "{\"aliases\":{\"logstash.tag1\":{\"is_write_index\":true}}}").
         to_return(:status => 200, :body => "", :headers => {})
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
@@ -1638,18 +1943,25 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       elastic_request = stub_elastic("https://logs.google.com:777/es//_bulk")
       driver.run(default_tag: 'test') do
-        driver.feed(sample_record)
+        driver.feed('tag1', event_time, sample_record)
       end
-      assert_equal('logstash-test', index_cmds.first['index']['_index'])
+      assert_equal('logstash.tag1', index_cmds.first['index']['_index'])
 
-      assert_equal ["logstash-test"], driver.instance.alias_indexes
+      assert_equal ["logstash.tag1"], driver.instance.alias_indexes
 
       assert_requested(elastic_request)
     end
 
-    def test_template_create_with_rollover_index_and_default_ilm_and_custom_and_time_placeholders
+    data("legacy_template" => [true, "_template"],
+         "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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_template.json')
+                      else
+                        File.join(cwd, 'test_index_template.json')
+                      end
 
       config = Fluent::Config::Element.new(
         'ROOT', '', {
@@ -1665,6 +1977,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
           'index_date_pattern' => 'now/w{xxxx.ww}',
           'index_name' => "${taskDef}-%Y.%m",
           'enable_ilm' => true,
+          'use_legacy_template' => use_legacy_template_flag,
+
         }, [
           Fluent::Config::Element.new('buffer', 'tag, time, taskDef', {
                                         'chunk_keys' => ['tag', 'time', 'taskDef'],
@@ -1680,14 +1994,21 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/#{task_def_value}-#{date_str}").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/#{task_def_value}-#{date_str}").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/#{task_def_value}-#{date_str}").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"#{task_def_value}-#{date_str}\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"#{task_def_value}-#{date_str}-*\",\"order\":52}").
-        to_return(:status => 200, :body => "", :headers => {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/#{task_def_value}-#{date_str}").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"#{task_def_value}-#{date_str}\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}},\"index_patterns\":\"#{task_def_value}-#{date_str}-*\",\"order\":52}").
+          to_return(:status => 200, :body => "", :headers => {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/#{task_def_value}-#{date_str}").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"index_patterns\":\"task_definition-#{date_str}-*\",\"template\":{\"settings\":{\"number_of_shards\":1,\"index.lifecycle.name\":\"logstash-policy\",\"index.lifecycle.rollover_alias\":\"task_definition-#{date_str}\"},\"mappings\":{\"type1\":{\"_source\":{\"enabled\":false},\"properties\":{\"host_name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"created_at\":{\"type\":\"date\",\"format\":\"EEE MMM dd HH:mm:ss Z YYYY\"}}}}},\"priority\":102}").
+          to_return(:status => 200, :body => "", :headers => {})
+      end
       # check if alias exists
       stub_request(:head, "https://logs.google.com:777/es//_alias/#{task_def_value}-#{date_str}").
         with(basic_auth: ['john', 'doe']).
@@ -1725,9 +2046,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
   end
 
-  def test_custom_template_create
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_create(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_alias_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_alias_template.json')
+                    else
+                      File.join(cwd, 'test_index_alias_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -1739,6 +2067,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_name   myapp_alias_template
       template_file   #{template_file}
       customize_template {"--appid--": "myapp-logs","--index_prefix--":"mylogs"}
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -1746,22 +2075,29 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/myapp_alias_template", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template", times: 1)
   end
 
-  def test_custom_template_create_with_customize_template_related_placeholders
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_create_with_customize_template_related_placeholders(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_alias_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_alias_template.json')
+                    else
+                      File.join(cwd, 'test_index_alias_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -1773,6 +2109,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_name   myapp_alias_template-${tag}
       template_file   #{template_file}
       customize_template {"--appid--": "${tag}-logs","--index_prefix--":"${tag}"}
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -1780,11 +2117,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template-test.template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template-test.template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template-test.template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template-test.template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
@@ -1798,12 +2135,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       driver.feed(sample_record)
     end
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/myapp_alias_template-test.template", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template-test.template", times: 1)
   end
 
-  def test_custom_template_installation_for_host_placeholder
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_installation_for_host_placeholder(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs-${tag}.google.com
@@ -1817,6 +2161,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       verify_es_version_at_startup false
       default_elasticsearch_version 6
       customize_template {"--appid--": "myapp-logs","--index_prefix--":"mylogs"}
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -1824,10 +2169,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs-test.google.com:777/es//_template/logstash").
+    stub_request(:get, "https://logs-test.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
-    stub_request(:put, "https://logs-test.google.com:777/es//_template/logstash").
+    stub_request(:put, "https://logs-test.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(status: 200, body: "", headers: {})
 
@@ -1839,9 +2184,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
   end
 
-  def test_custom_template_with_rollover_index_create
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_with_rollover_index_create(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_alias_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_alias_template.json')
+                    else
+                      File.join(cwd, 'test_index_alias_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -1857,6 +2209,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       index_date_pattern now/w{xxxx.ww}
       index_name    mylogs
       application_name myapp
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -1864,11 +2217,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # creation of index which can rollover
@@ -1886,12 +2239,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/myapp_alias_template", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template", times: 1)
   end
 
-  def test_custom_template_with_rollover_index_create_and_deflector_alias
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_with_rollover_index_create_and_deflector_alias(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_alias_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_alias_template.json')
+                    else
+                      File.join(cwd, 'test_index_alias_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -1908,6 +2268,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       deflector_alias myapp_deflector
       index_name    mylogs
       application_name myapp
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -1915,11 +2276,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # creation of index which can rollover
@@ -1937,12 +2298,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/myapp_alias_template", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template", times: 1)
   end
 
-  def test_custom_template_with_rollover_index_create_with_logstash_format
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_with_rollover_index_create_with_logstash_format(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_alias_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_alias_template.json')
+                    else
+                      File.join(cwd, 'test_index_alias_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -1959,19 +2327,20 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       logstash_format true
       logstash_prefix mylogs
       application_name myapp
+      use_legacy_template #{use_legacy_template_flag}
     }
 
-    timestr = Time.now.strftime("%Y.%m.%d")
+    timestr = Time.now.getutc.strftime("%Y.%m.%d")
     # connection start
     stub_request(:head, "https://logs.google.com:777/es//").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # creation of index which can rollover
@@ -2006,9 +2375,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       end
     end
 
-    def test_custom_template_with_rollover_index_create_and_default_ilm
+    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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_alias_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_alias_template.json')
+                      else
+                        File.join(cwd, 'test_index_alias_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -2025,6 +2401,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         application_name myapp
         ilm_policy_id   fluentd-policy
         enable_ilm      true
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -2032,11 +2409,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # creation of index which can rollover
@@ -2047,13 +2424,20 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:head, "https://logs.google.com:777/es//_alias/mylogs").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/mylogs").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/mylogs").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/mylogs").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"order\":6,\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}},\"index_patterns\":\"mylogs-*\"}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"order\":6,\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}},\"index_patterns\":\"mylogs-*\"}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"priority\":106,\"index_patterns\":\"mylogs-*\",\"template\":{\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}}}}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       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'],
@@ -2072,12 +2456,19 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       driver(config)
 
-      assert_requested(:put, "https://logs.google.com:777/es//_template/mylogs", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs", times: 1)
     end
 
-    def test_custom_template_with_rollover_index_create_and_default_ilm_and_ilm_policy_overwrite
+    data("legacy_template" => [true, "_template"],
+         "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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_alias_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_alias_template.json')
+                      else
+                        File.join(cwd, 'test_index_alias_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -2096,6 +2487,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         enable_ilm      true
         ilm_policy_overwrite true
         ilm_policy {"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"60gb","max_age": "45d"}}}}}}
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -2103,11 +2495,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # creation of index which can rollover
@@ -2118,13 +2510,20 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:head, "https://logs.google.com:777/es//_alias/mylogs").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/mylogs").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/mylogs").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/mylogs").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"order\":6,\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}},\"index_patterns\":\"mylogs-*\"}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"order\":6,\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}},\"index_patterns\":\"mylogs-*\"}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"priority\":106,\"index_patterns\":\"mylogs-*\",\"template\":{\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}}}}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
       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'],
@@ -2143,7 +2542,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       driver(config)
 
-      assert_requested(:put, "https://logs.google.com:777/es//_template/mylogs", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs", times: 1)
     end
 
     def test_custom_template_with_rollover_index_create_and_default_ilm_with_deflector_alias
@@ -2174,9 +2573,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       end
     end
 
-    def test_custom_template_with_rollover_index_create_and_default_ilm_and_placeholders
+    data("legacy_template" => [true, "_template"],
+         "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
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_alias_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_alias_template.json')
+                      else
+                        File.join(cwd, 'test_index_alias_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -2193,12 +2599,62 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         application_name myapp
         ilm_policy_id   fluentd-policy
         enable_ilm      true
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
       stub_request(:head, "https://logs.google.com:777/es//").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
+
+      # test-tag1
+      # check if template exists
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      # creation
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 200, :body => "", :headers => {})
+      # creation of index which can rollover
+      stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-test-tag1-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 200, :body => "", :headers => {})
+      # check if alias exists
+      stub_request(:head, "https://logs.google.com:777/es//_alias/mylogs-test-tag1").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/mylogs-test-tag1").
+        with(basic_auth: ['john', 'doe']).
+        to_return(status: 404, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs-test-tag1").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"order\":8,\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs-test-tag1\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}},\"index_patterns\":\"mylogs-test-tag1-*\"}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs-test-tag1").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"priority\":108,\"index_patterns\":\"mylogs-test-tag1-*\",\"template\":{\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs-test-tag1\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}}}}").
+          to_return(status: 200, body: "", headers: {})
+      end
+      # put the alias for the index
+      stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-test-tag1-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/mylogs-test-tag1").
+        with(basic_auth: ['john', 'doe'],
+             :body => "{\"aliases\":{\"mylogs-test-tag1\":{\"is_write_index\":true}}}").
+        to_return(:status => 200, :body => "", :headers => {})
+      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").
+        with(basic_auth: ['john', 'doe']).
+        to_return(:status => 404, :body => "", :headers => {})
+      stub_request(:put, "https://logs.google.com:777/es//_ilm/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 => {})
+
+      # test-tag2
       # check if template exists
       stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
         with(basic_auth: ['john', 'doe']).
@@ -2208,24 +2664,31 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # creation of index which can rollover
-      stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-custom-test-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
+      stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-test-tag2-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if alias exists
-      stub_request(:head, "https://logs.google.com:777/es//_alias/mylogs-custom-test").
+      stub_request(:head, "https://logs.google.com:777/es//_alias/mylogs-test-tag2").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/mylogs-custom-test").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/mylogs-test-tag2").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/mylogs-custom-test").
-        with(basic_auth: ['john', 'doe'],
-             body: "{\"order\":8,\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs-custom-test\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}},\"index_patterns\":\"mylogs-custom-test-*\"}").
-        to_return(status: 200, body: "", headers: {})
+      if use_legacy_template_flag
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs-test-tag2").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"order\":8,\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs-test-tag2\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}},\"index_patterns\":\"mylogs-test-tag2-*\"}").
+          to_return(status: 200, body: "", headers: {})
+      else
+        stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs-test-tag2").
+          with(basic_auth: ['john', 'doe'],
+               body: "{\"priority\":108,\"index_patterns\":\"mylogs-test-tag2-*\",\"template\":{\"settings\":{\"index.lifecycle.name\":\"fluentd-policy\",\"index.lifecycle.rollover_alias\":\"mylogs-test-tag2\"},\"mappings\":{},\"aliases\":{\"myapp-logs-alias\":{}}}}").
+          to_return(status: 200, body: "", headers: {})
+      end
       # put the alias for the index
-      stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-custom-test-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/mylogs-custom-test").
+      stub_request(:put, "https://logs.google.com:777/es//%3Cmylogs-test-tag2-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/#{alias_endpoint}/mylogs-test-tag2").
         with(basic_auth: ['john', 'doe'],
-             :body => "{\"aliases\":{\"mylogs-custom-test\":{\"is_write_index\":true}}}").
+             :body => "{\"aliases\":{\"mylogs-test-tag2\":{\"is_write_index\":true}}}").
         to_return(:status => 200, :body => "", :headers => {})
       stub_request(:get, "https://logs.google.com:777/es//_xpack").
         with(basic_auth: ['john', 'doe']).
@@ -2241,19 +2704,28 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       driver(config)
 
       elastic_request = stub_elastic("https://logs.google.com:777/es//_bulk")
-      driver.run(default_tag: 'custom-test') do
-        driver.feed(sample_record)
+      driver.run(default_tag: 'test') do
+        driver.feed("test-tag1", event_time, sample_record)
+        driver.feed("test-tag2", event_time, sample_record)
+        driver.feed("test-tag1", event_time, sample_record)
+        driver.feed("test-tag2", event_time, sample_record)
       end
-      assert_equal('mylogs-custom-test', index_cmds.first['index']['_index'])
-
-      assert_equal ["mylogs-custom-test"], driver.instance.alias_indexes
+      assert_equal('mylogs-test-tag2', index_cmds.first['index']['_index'])
+      assert_equal ["mylogs-test-tag1", "mylogs-test-tag2"], driver.instance.alias_indexes
 
       assert_requested(elastic_request)
     end
 
-    def test_custom_template_with_rollover_index_create_and_custom_ilm
+    data("legacy_template" => [true, "_template"],
+         "new_template"    => [false, "_index_template"])
+    def test_custom_template_with_rollover_index_create_and_custom_ilm(data)
+      use_legacy_template_flag, endpoint = data
       cwd = File.dirname(__FILE__)
-      template_file = File.join(cwd, 'test_alias_template.json')
+      template_file = if use_legacy_template_flag
+                        File.join(cwd, 'test_alias_template.json')
+                      else
+                        File.join(cwd, 'test_index_alias_template.json')
+                      end
 
       config = %{
         host            logs.google.com
@@ -2271,6 +2743,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         ilm_policy_id   fluentd-policy
         enable_ilm      true
         ilm_policy      {"policy":{"phases":{"hot":{"actions":{"rollover":{"max_size":"70gb", "max_age":"30d"}}}}}}
+        use_legacy_template #{use_legacy_template_flag}
       }
 
       # connection start
@@ -2278,11 +2751,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # check if template exists
-      stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
       # creation
-      stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 200, :body => "", :headers => {})
       # creation of index which can rollover
@@ -2293,10 +2766,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       stub_request(:head, "https://logs.google.com:777/es//_alias/mylogs").
         with(basic_auth: ['john', 'doe']).
         to_return(:status => 404, :body => "", :headers => {})
-      stub_request(:get, "https://logs.google.com:777/es//_template/mylogs").
+      stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/mylogs").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 404, body: "", headers: {})
-      stub_request(:put, "https://logs.google.com:777/es//_template/mylogs").
+      stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs").
         with(basic_auth: ['john', 'doe']).
         to_return(status: 200, body: "", headers: {})
       # put the alias for the index
@@ -2317,13 +2790,20 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
       driver(config)
 
-      assert_requested(:put, "https://logs.google.com:777/es//_template/mylogs", times: 1)
+      assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/mylogs", times: 1)
     end
   end
 
-  def test_template_overwrite
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_template_overwrite(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -2335,6 +2815,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_name   logstash
       template_file   #{template_file}
       template_overwrite true
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -2342,22 +2823,29 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
   end
 
-  def test_custom_template_overwrite
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_overwrite(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -2370,6 +2858,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_file   #{template_file}
       template_overwrite true
       customize_template {"--appid--": "myapp-logs","--index_prefix--":"mylogs"}
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -2377,22 +2866,29 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/myapp_alias_template", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template", times: 1)
   end
 
-  def test_custom_template_with_rollover_index_overwrite
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_custom_template_with_rollover_index_overwrite(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -2409,6 +2905,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       rollover_index  true
       index_name    mylogs
       application_name myapp
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -2416,11 +2913,11 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/myapp_alias_template").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # creation of index which can rollover
@@ -2438,7 +2935,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/myapp_alias_template", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/myapp_alias_template", times: 1)
   end
 
   def test_template_create_invalid_filename
@@ -2468,9 +2965,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     }
   end
 
-  def test_template_create_for_host_placeholder
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_template_create_for_host_placeholder(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs-${tag}.google.com
@@ -2483,6 +2987,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_file   #{template_file}
       verify_es_version_at_startup false
       default_elasticsearch_version 6
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     # connection start
@@ -2490,10 +2995,10 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs-test.google.com:777/es//_template/logstash").
+    stub_request(:get, "https://logs-test.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
-    stub_request(:put, "https://logs-test.google.com:777/es//_template/logstash").
+    stub_request(:put, "https://logs-test.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(status: 200, body: "", headers: {})
     stub_request(:post, "https://logs-test.google.com:777/es//_bulk").
@@ -2508,9 +3013,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     end
   end
 
-  def test_template_retry_install_fails
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_template_retry_install_fails(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -2522,11 +3034,12 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_name   logstash
       template_file   #{template_file}
       max_retry_putting_template 3
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     connection_resets = 0
     # check if template exists
-    stub_request(:get, "https://logs.google.com:778/es//_template/logstash")
+    stub_request(:get, "https://logs.google.com:778/es//#{endpoint}/logstash")
       .with(basic_auth: ['john', 'doe']) do |req|
       connection_resets += 1
       raise Faraday::ConnectionFailed, "Test message"
@@ -2539,9 +3052,16 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_equal(4, connection_resets)
   end
 
-  def test_template_retry_install_does_not_fail
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_template_retry_install_does_not_fail(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -2554,11 +3074,12 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_file   #{template_file}
       max_retry_putting_template 3
       fail_on_putting_template_retry_exceed false
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     connection_resets = 0
     # check if template exists
-    stub_request(:get, "https://logs.google.com:778/es//_template/logstash")
+    stub_request(:get, "https://logs.google.com:778/es//#{endpoint}/logstash")
       .with(basic_auth: ['john', 'doe']) do |req|
       connection_resets += 1
       raise Faraday::ConnectionFailed, "Test message"
@@ -2569,9 +3090,17 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_equal(4, connection_resets)
   end
 
-  def test_templates_create
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_templates_create(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
+
     config = %{
       host            logs.google.com
       port            777
@@ -2580,43 +3109,52 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       user            john
       password        doe
       templates       {"logstash1":"#{template_file}", "logstash2":"#{template_file}","logstash3":"#{template_file}" }
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     stub_request(:head, "https://logs.google.com:777/es//").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
      # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
 
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash3").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash3").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {}) #exists
 
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash3").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash3").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_requested( :put, "https://logs.google.com:777/es//_template/logstash1", times: 1)
-    assert_requested( :put, "https://logs.google.com:777/es//_template/logstash2", times: 1)
-    assert_not_requested(:put, "https://logs.google.com:777/es//_template/logstash3") #exists
+    assert_requested( :put, "https://logs.google.com:777/es//#{endpoint}/logstash1", times: 1)
+    assert_requested( :put, "https://logs.google.com:777/es//#{endpoint}/logstash2", times: 1)
+    assert_not_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash3") #exists
   end
 
-  def test_templates_overwrite
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_templates_overwrite(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
+
     config = %{
       host            logs.google.com
       port            777
@@ -2626,42 +3164,50 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       password        doe
       templates       {"logstash1":"#{template_file}", "logstash2":"#{template_file}","logstash3":"#{template_file}" }
       template_overwrite true
+      use_legacy_template #{use_legacy_template_flag}
     }
 
     stub_request(:head, "https://logs.google.com:777/es//").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
      # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash3").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash3").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {}) #exists
 
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash3").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash3").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/logstash1", times: 1)
-    assert_requested(:put, "https://logs.google.com:777/es//_template/logstash2", times: 1)
-    assert_requested(:put, "https://logs.google.com:777/es//_template/logstash3", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash1", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash3", times: 1)
   end
 
-  def test_templates_not_used
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_templates_are_also_used(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
 
     config = %{
       host            logs.google.com
@@ -2673,43 +3219,52 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       template_name   logstash
       template_file   #{template_file}
       templates       {"logstash1":"#{template_file}", "logstash2":"#{template_file}" }
+      use_legacy_template #{use_legacy_template_flag}
     }
     # connection start
     stub_request(:head, "https://logs.google.com:777/es//").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
     # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
     #creation
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
     driver(config)
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/logstash", times: 1)
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash", times: 1)
 
-    assert_not_requested(:put, "https://logs.google.com:777/es//_template/logstash1")
-    assert_not_requested(:put, "https://logs.google.com:777/es//_template/logstash2")
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash1")
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2")
   end
 
-  def test_templates_can_be_partially_created_if_error_occurs
+  data("legacy_template" => [true, "_template"],
+       "new_template"    => [false, "_index_template"])
+  def test_templates_can_be_partially_created_if_error_occurs(data)
+    use_legacy_template_flag, endpoint = data
     cwd = File.dirname(__FILE__)
-    template_file = File.join(cwd, 'test_template.json')
+    template_file = if use_legacy_template_flag
+                      File.join(cwd, 'test_template.json')
+                    else
+                      File.join(cwd, 'test_index_template.json')
+                    end
+
     config = %{
       host            logs.google.com
       port            777
@@ -2718,22 +3273,23 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       user            john
       password        doe
       templates       {"logstash1":"#{template_file}", "logstash2":"/abc" }
+      use_legacy_template #{use_legacy_template_flag}
     }
     stub_request(:head, "https://logs.google.com:777/es//").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
      # check if template exists
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
-    stub_request(:get, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:get, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 404, :body => "", :headers => {})
 
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash1").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash1").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
-    stub_request(:put, "https://logs.google.com:777/es//_template/logstash2").
+    stub_request(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2").
       with(basic_auth: ['john', 'doe']).
       to_return(:status => 200, :body => "", :headers => {})
 
@@ -2741,8 +3297,8 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
       driver(config)
     }
 
-    assert_requested(:put, "https://logs.google.com:777/es//_template/logstash1", times: 1)
-    assert_not_requested(:put, "https://logs.google.com:777/es//_template/logstash2")
+    assert_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash1", times: 1)
+    assert_not_requested(:put, "https://logs.google.com:777/es//#{endpoint}/logstash2")
   end
 
   def test_legacy_hosts_list
@@ -2910,6 +3466,18 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_requested(elastic_request)
   end
 
+  def test_api_key_header
+    stub_request(:head, "http://localhost:9200/").
+      to_return(:status => 200, :body => "", :headers => {})
+    elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                        with(headers: {'Authorization'=>'ApiKey dGVzdGF1dGhoZWFkZXI='})
+    driver.configure(%[api_key testauthheader])
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
+    assert_requested(elastic_request)
+  end
+
   def test_write_message_with_bad_chunk
     driver.configure("target_index_key bad_value\n@log_level debug\n")
     stub_elastic
@@ -3020,6 +3588,39 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     assert_requested(request, times: 2)
   end
 
+  def test_writes_with_record_metadata
+    chunk_id_key = "metadata_key".freeze
+    driver.configure(Fluent::Config::Element.new(
+                       'ROOT', '', {
+                         '@type' => 'elasticsearch',
+                       }, [
+                         Fluent::Config::Element.new('metadata', '', {
+                                                       'include_chunk_id' => true,
+                                                       'chunk_id_key' => chunk_id_key,
+                                                     }, [])
+                       ]
+                     ))
+    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|
+      @index_cmds = req.body.split("\n").map {|r| JSON.parse(r) }
+    end
+    driver.run(default_tag: 'test', shutdown: false) do
+      driver.feed(sample_record)
+    end
+    assert_true index_cmds[1].has_key?(chunk_id_key)
+    first_chunk_id = index_cmds[1].fetch(chunk_id_key)
+
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
+    assert_true index_cmds[1].has_key?(chunk_id_key)
+    second_chunk_id = index_cmds[1].fetch(chunk_id_key)
+    assert do
+      first_chunk_id != second_chunk_id
+    end
+  end
+
   def test_writes_with_huge_records_but_uncheck
     driver.configure(Fluent::Config::Element.new(
                        'ROOT', '', {
@@ -3922,7 +4523,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     stub_elastic
 
     ts = "2001/02/03 13:14:01,673+02:00"
-    index = "logstash-#{Date.today.strftime("%Y.%m.%d")}"
+    index = "logstash-#{Time.now.getutc.strftime("%Y.%m.%d")}"
 
     flexmock(driver.instance.router).should_receive(:emit_error_event)
       .with(tag_for_error, Fluent::EventTime, Hash, ArgumentError).once