noop: group-templates in prep for ecs-compatible additions

Author: yaauie

lib/logstash/outputs/elasticsearch/template_manager.rb

@@ -48,7 +48,7 @@ def self.template_name(plugin)
 
     def self.default_template_path(es_major_version)
       template_version = es_major_version == 1 ? 2 : es_major_version
-      default_template_name = "elasticsearch-template-es#{template_version}x.json"
+      default_template_name = "templates/ecs-disabled/elasticsearch-#{template_version}x.json"
       ::File.expand_path(default_template_name, ::File.dirname(__FILE__))
     end
 

lib/logstash/outputs/elasticsearch/elasticsearch-template-es2x.json renamed to lib/logstash/outputs/elasticsearch/templates/ecs-disabled/elasticsearch-2x.json

@@ -8,17 +8,17 @@
   describe ".default_template_path" do
     context "elasticsearch 1.x" do
       it "chooses the 2x template" do
-        expect(described_class.default_template_path(1)).to match(/elasticsearch-template-es2x.json/)
+        expect(described_class.default_template_path(1)).to end_with("/templates/ecs-disabled/elasticsearch-2x.json")
       end
     end
     context "elasticsearch 2.x" do
       it "chooses the 2x template" do
-        expect(described_class.default_template_path(2)).to match(/elasticsearch-template-es2x.json/)
+        expect(described_class.default_template_path(2)).to end_with("/templates/ecs-disabled/elasticsearch-2x.json")
       end
     end
     context "elasticsearch 5.x" do
       it "chooses the 5x template" do
-        expect(described_class.default_template_path(5)).to match(/elasticsearch-template-es5x.json/)
+        expect(described_class.default_template_path(5)).to end_with("/templates/ecs-disabled/elasticsearch-5x.json")
       end
     end
   end

lib/logstash/outputs/elasticsearch/elasticsearch-template-es5x.json renamed to lib/logstash/outputs/elasticsearch/templates/ecs-disabled/elasticsearch-5x.json

@@ -6,7 +6,7 @@
 describe LogStash::Outputs::ElasticSearch do
   subject { described_class.new(options) }
   let(:options) { {} }
-  let(:maximum_seen_major_version) { rand(100) }
+  let(:maximum_seen_major_version) { [1,2,5,6,7,8].sample }
 
   let(:do_register) { true }