Replace use of 'template' with 'index_patterns' when amending templates

Author: robbavey

lib/logstash/outputs/elasticsearch/template_manager.rb

@@ -24,17 +24,19 @@ def self.install(client, template_name, template, template_overwrite)
 
     def self.add_ilm_settings_to_template(plugin, template)
       # Include ilm settings in template:
-			plugin.logger.info("Overwriting template name and pattern as ILM is enabled.")
-      template['template'] = "#{plugin.ilm_rollover_alias}-*"
+			plugin.logger.info("Overwriting index patterns, as ILM is enabled.")
+      # Overwrite any index patterns, and use the rollover alias. Use 'index_patterns' rather than 'template' for pattern
+      # definition - remove any existing definition of 'template'
+      template.delete('template') if template.include?('template')
+      template['index_patterns'] = "#{plugin.ilm_rollover_alias}-*"
       if template['settings'] && (template['settings']['index.lifecycle.name'] || template['settings']['index.lifecycle.rollover_alias'])
         plugin.logger.info("Overwriting index lifecycle name and rollover alias as ILM is enabled.")
       end
       template['settings'].update({ 'index.lifecycle.name' => plugin.ilm_policy, 'index.lifecycle.rollover_alias' => plugin.ilm_rollover_alias})
     end
 
-    # TODO: Verify this is ok
     def self.template_name(plugin)
-      plugin.ilm_enabled? ? plugin.ilm_rollover_alias : plugin.template_name
+      (plugin.ilm_enabled? && !plugin.template_name) ? plugin.ilm_rollover_alias : plugin.template_name
     end
 
     def self.default_template_path(es_major_version)

spec/fixtures/template-with-policy-es6x.json

@@ -1,11 +1,11 @@
 {
-  "template" : "custom-*",
+  "template" : "overwrite-*",
   "version" : 60001,
   "settings" : {
     "index.refresh_interval" : "1s",
     "number_of_shards": 1,
-    "index.lifecycle.name": "custom-policy",
-    "index.lifecycle.rollover_alias": "custom"
+    "index.lifecycle.name": "overwrite-policy",
+    "index.lifecycle.rollover_alias": "overwrite"
   },
   "mappings" : {
     "_default_" : {

spec/fixtures/template-with-policy-es7x.json

@@ -1,5 +1,5 @@
 {
-  "template" : "custom-*",
+  "index_patterns" : "overwrite-*",
   "version" : 60001,
   "settings" : {
     "index.refresh_interval" : "1s",

spec/integration/outputs/ilm_spec.rb

@@ -396,14 +396,15 @@
       end
 
       context 'with a custom template' do
-        let (:ilm_rollover_alias) { "custom" }
+        let (:ilm_rollover_alias) { "the_cat_in_the_hat" }
         let (:index) { ilm_rollover_alias }
         let(:expected_index) { index }
+        let (:template_name) { "custom" }
         let (:settings) { super.merge("ilm_policy" => ilm_policy_name,
                                       "template" => template,
                                       "template_name" => template_name,
                                       "ilm_rollover_alias" => ilm_rollover_alias)}
-        let (:template_name) { "custom" }
+
 
         if ESHelper.es_version_satisfies?(">= 7.0")
           let (:template) { "spec/fixtures/template-with-policy-es7x.json" }
@@ -441,6 +442,7 @@
         it 'should write the ILM settings into the template' do
           subject.register
           sleep(1)
+          puts @es.indices.get_template(name: template_name)[template_name]
           expect(@es.indices.get_template(name: template_name)[template_name]["index_patterns"]).to eq(["#{ilm_rollover_alias}-*"])
           expect(@es.indices.get_template(name: template_name)[template_name]["settings"]['index']['lifecycle']['name']).to eq(ilm_policy_name)
           expect(@es.indices.get_template(name: template_name)[template_name]["settings"]['index']['lifecycle']['rollover_alias']).to eq(ilm_rollover_alias)