Cleanup template naming

Also some test cleanup

Author: robbavey

lib/logstash/outputs/elasticsearch/template_manager.rb

@@ -34,8 +34,11 @@ def self.add_ilm_settings_to_template(plugin, template)
       template['settings'].update({ 'index.lifecycle.name' => plugin.ilm_policy, 'index.lifecycle.rollover_alias' => plugin.ilm_rollover_alias})
     end
 
+    # Template name - if template_name set, use it
+    #                 if not and ILM is enabled, use the rollover alias
+    #                 else use the default value of template_name
     def self.template_name(plugin)
-      (plugin.ilm_enabled? && !plugin.template_name) ? plugin.ilm_rollover_alias : plugin.template_name
+      plugin.ilm_enabled? && !plugin.original_params.key?('template_name') ? plugin.ilm_rollover_alias : plugin.template_name
     end
 
     def self.default_template_path(es_major_version)

spec/integration/outputs/ilm_spec.rb

@@ -399,10 +399,8 @@
         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)}
 
 
@@ -419,6 +417,8 @@
           put_policy(@es,ilm_policy_name, policy)
         end
 
+        it_behaves_like 'an ILM enabled Logstash'
+
         it 'should create the rollover alias' do
           expect(@es.indices.exists_alias(index: ilm_rollover_alias)).to be_falsey
           subject.register
@@ -442,12 +442,26 @@
         it 'should write the ILM settings into the template' do
           subject.register
           sleep(1)
-          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)
+          expect(@es.indices.get_template(name: ilm_rollover_alias)[ilm_rollover_alias]["index_patterns"]).to eq(["#{ilm_rollover_alias}-*"])
+          expect(@es.indices.get_template(name: ilm_rollover_alias)[ilm_rollover_alias]["settings"]['index']['lifecycle']['name']).to eq(ilm_policy_name)
+          expect(@es.indices.get_template(name: ilm_rollover_alias)[ilm_rollover_alias]["settings"]['index']['lifecycle']['rollover_alias']).to eq(ilm_rollover_alias)
+        end
+
+        context 'with a different template_name' do
+          let (:template_name) { "custom_template_name" }
+          let (:settings) { super.merge('template_name' => template_name)}
+
+          it_behaves_like 'an ILM enabled Logstash'
+
+          it 'should write the ILM settings into the template' do
+            subject.register
+            sleep(1)
+            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)
+          end
         end
 
-        it_behaves_like 'an ILM enabled Logstash'
       end
     end
 
@@ -467,22 +481,19 @@
         expect{get_policy(@es, LogStash::Outputs::ElasticSearch::DEFAULT_POLICY)}.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
       end
 
-      it 'should write the ILM settings into the template' do
+      it 'should not write the ILM settings into the template' do
         subject.register
         sleep(1)
         expect(@es.indices.get_template(name: "logstash")["logstash"]["index_patterns"]).to eq(["logstash-*"])
         expect(@es.indices.get_template(name: "logstash")["logstash"]["settings"]['index']['lifecycle']).to be_nil
-
       end
 
-
       context 'with an existing policy that will roll over' do
         let (:policy) { small_max_doc_policy }
         let (:ilm_policy_name) { "3_docs"}
         let (:settings) { super.merge("ilm_policy" => ilm_policy_name)}
 
-        it 'should index documents normally' do
-
+        it 'should not roll over indices' do
           subject.register
           subject.multi_receive([
                                     LogStash::Event.new("message" => "sample message here"),
@@ -513,6 +524,19 @@
           expect(indexes_written.values.first).to eq(6)
         end
       end
+
+      context 'with a custom template name' do
+        let (:template_name) { "custom_template_name" }
+        let (:settings) { super.merge('template_name' => template_name)}
+
+        it 'should not write the ILM settings into the template' do
+          subject.register
+          sleep(1)
+          expect(@es.indices.get_template(name: template_name)[template_name]["index_patterns"]).to eq(["logstash-*"])
+          expect(@es.indices.get_template(name: template_name)[template_name]["settings"]['index']['lifecycle']).to be_nil
+        end
+      end
+
     end
   end
 end