remove major versions specific code for ES < 6

Author: jsvd

lib/logstash/outputs/elasticsearch.rb

@@ -443,7 +443,7 @@ def retry_on_conflict_action_name
   end
 
   def routing_field_name
-    maximum_seen_major_version >= 6 ? :routing : :_routing
+    :routing
   end
 
   # Determine the correct value for the 'type' field for the given event
@@ -456,9 +456,7 @@ def get_event_type(event)
              event.sprintf(@document_type)
            else
              major_version = maximum_seen_major_version
-             if major_version < 6
-               es5_event_type(event)
-             elsif major_version == 6
+             if major_version == 6
                DEFAULT_EVENT_TYPE_ES6
              elsif major_version == 7
                DEFAULT_EVENT_TYPE_ES7

lib/logstash/outputs/elasticsearch/template_manager.rb

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

spec/unit/outputs/elasticsearch_spec.rb

@@ -7,7 +7,7 @@
 describe LogStash::Outputs::ElasticSearch do
   subject(:elasticsearch_output_instance) { described_class.new(options) }
   let(:options) { {} }
-  let(:maximum_seen_major_version) { [1,2,5,6,7,8].sample }
+  let(:maximum_seen_major_version) { [6,7,8].sample }
 
   let(:do_register) { true }
 
@@ -79,13 +79,6 @@
             expect(subject.send(:get_event_type, LogStash::Event.new("type" => "foo"))).to eql("doc")
           end
         end
-
-        context "for < 6.0 elasticsearch clusters" do
-          let(:maximum_seen_major_version) { 5 }
-          it "should get the type from the event" do
-            expect(subject.send(:get_event_type, LogStash::Event.new("type" => "foo"))).to eql("foo")
-          end
-        end
       end
 
       context "with 'document type set'" do