logstash-output-elasticsearch 12.0.1-java → 12.0.2-java

data/spec/unit/outputs/elasticsearch/data_stream_support_spec.rb

@@ -286,29 +286,6 @@ describe LogStash::Outputs::ElasticSearch::DataStreamSupport do
       end
 
     end
-
-    context 'non-compatible ES' do
-
-      let(:es_version) { '6.8.11' }
-
-      it "prints an error (from after_successful_connection thread) on LS 7.x" do
-        change_constant :LOGSTASH_VERSION, '7.12.0' do
-          expect( subject.logger ).to receive(:error).with(/Elasticsearch version does not support data streams/,
-                                                           {:es_version=>"6.8.11"})
-          stub_plugin_register!
-        end
-      end
-
-      it "prints an error (from after_successful_connection thread) on LS 8.0" do
-        change_constant :LOGSTASH_VERSION, '8.0.5' do
-          expect( subject.logger ).to receive(:error).with(/Elasticsearch version does not support data streams/,
-                                                           {:es_version=>"6.8.11"})
-          stub_plugin_register!
-        end
-      end
-
-    end
-
   end
 
   describe "auto routing" do

data/spec/unit/outputs/elasticsearch/http_client/pool_spec.rb

@@ -203,29 +203,6 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
     let(:ip_address) { "192.168.1.0"}
     let(:port) { 9200 }
 
-    context 'in Elasticsearch 1.x format' do
-      context 'with host and ip address' do
-        let(:publish_address) { "inet[#{host}/#{ip_address}:#{port}]"}
-        it 'should correctly extract the host' do
-          expect(subject.address_str_to_uri(publish_address)).to eq (LogStash::Util::SafeURI.new("#{host}:#{port}"))
-        end
-      end
-      context 'with ip address' do
-        let(:publish_address) { "inet[/#{ip_address}:#{port}]"}
-        it 'should correctly extract the ip address' do
-          expect(subject.address_str_to_uri(publish_address)).to eq (LogStash::Util::SafeURI.new("#{ip_address}:#{port}"))
-        end
-      end
-    end
-
-    context 'in Elasticsearch 2.x-6.x format' do
-      let(:publish_address) { "#{ip_address}:#{port}"}
-      it 'should correctly extract the ip address' do
-        expect(subject.address_str_to_uri(publish_address)).to eq (LogStash::Util::SafeURI.new("//#{ip_address}:#{port}"))
-      end
-    end
-
-    context 'in Elasticsearch 7.x'
     context 'with host and ip address' do
       let(:publish_address) { "#{host}/#{ip_address}:#{port}"}
       it 'should correctly extract the host' do
@@ -367,14 +344,19 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
 
     let(:root_response) { MockResponse.new(200, {"tagline" => "You Know, for Search",
                                                   "version" => {
-                                                    "number" => '0.0.0',
-                                                    "build_flavor" => 'default'}
-    }) }
-    let(:root_response2) { MockResponse.new(200, {"tagline" => "You Know, for Search",
-                                                  "version" => {
-                                                    "number" => '6.0.0',
+                                                    "number" => '7.0.0',
                                                     "build_flavor" => 'default'}
     }) }
+    let(:root_response2) { MockResponse.new(200,
+                                            {
+                                              "tagline" => "You Know, for Search",
+                                              "version" => {
+                                                "number" => '8.0.0',
+                                                "build_flavor" => 'default'
+                                              }
+                                            },
+                                            { "x-elastic-product" => "Elasticsearch" }
+    ) }
 
     context "if there are nodes with multiple major versions" do
       before(:each) do
@@ -383,7 +365,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
       end
 
       it "picks the largest major version" do
-        expect(subject.maximum_seen_major_version).to eq(6)
+        expect(subject.maximum_seen_major_version).to eq(8)
       end
     end
   end
@@ -542,30 +524,6 @@ describe "#elasticsearch?" do
     end
   end
 
-  context "when connecting to a cluster with version < 6.0.0" do
-    it "should fail" do
-      resp = MockResponse.new(200, {"version" => { "number" => "5.0.0" }})
-      expect(subject.send(:elasticsearch?, resp)).to be false
-    end
-  end
-
-  context "when connecting to a cluster with version in [6.0.0..7.0.0)" do
-    it "must be successful with valid 'tagline'" do
-      resp = MockResponse.new(200, {"version" => {"number" => "6.5.0"}, "tagline" => "You Know, for Search"} )
-      expect(subject.send(:elasticsearch?, resp)).to be true
-    end
-
-    it "should fail if invalid 'tagline'" do
-      resp = MockResponse.new(200, {"version" => {"number" => "6.5.0"}, "tagline" => "You don't know"} )
-      expect(subject.send(:elasticsearch?, resp)).to be false
-    end
-
-    it "should fail if 'tagline' is not present" do
-      resp = MockResponse.new(200, {"version" => {"number" => "6.5.0"}} )
-      expect(subject.send(:elasticsearch?, resp)).to be false
-    end
-  end
-
   context "when connecting to a cluster with version in [7.0.0..7.14.0)" do
     it "must be successful is 'build_flavor' is 'default' and tagline is correct" do
       resp = MockResponse.new(200, {"version": {"number": "7.5.0", "build_flavor": "default"}, "tagline": "You Know, for Search"} )

data/spec/unit/outputs/elasticsearch/template_manager_spec.rb

@@ -4,11 +4,6 @@ require "logstash/outputs/elasticsearch/template_manager"
 describe LogStash::Outputs::ElasticSearch::TemplateManager do
 
   describe ".default_template_path" do
-    context "elasticsearch 6.x" do
-      it "chooses the 6x template" do
-        expect(described_class.default_template_path(6)).to end_with("/templates/ecs-disabled/elasticsearch-6x.json")
-      end
-    end
     context "elasticsearch 7.x" do
       it "chooses the 7x template" do
         expect(described_class.default_template_path(7)).to end_with("/templates/ecs-disabled/elasticsearch-7x.json")
@@ -52,7 +47,7 @@ describe LogStash::Outputs::ElasticSearch::TemplateManager do
         end
       end
 
-      describe "in version < 8" do
+      describe "in version 7" do
         let(:file_path) { described_class.default_template_path(7) }
         let(:template) { described_class.read_template_file(file_path)}
 
@@ -96,7 +91,7 @@ describe LogStash::Outputs::ElasticSearch::TemplateManager do
       describe "with `template_api => 'auto'`" do
         let(:template_api) { "auto" }
 
-        describe "with ES < 8 versions" do
+        describe "with ES 7" do
 
           it 'resolves legacy index template API compatible setting' do
             expect(plugin).to receive(:serverless?).and_return(false)
@@ -134,7 +129,7 @@ describe LogStash::Outputs::ElasticSearch::TemplateManager do
         end
       end
 
-      describe "in version < 8" do
+      describe "in version 7" do
         it "should use legacy template API" do
           expect(plugin).to receive(:serverless?).and_return(false)
           expect(plugin).to receive(:maximum_seen_major_version).at_least(:once).and_return(7)

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -9,7 +9,7 @@ require 'rspec/collection_matchers'
 describe LogStash::Outputs::ElasticSearch do
   subject(:elasticsearch_output_instance) { described_class.new(options) }
   let(:options) { {} }
-  let(:maximum_seen_major_version) { [6,7,8].sample }
+  let(:maximum_seen_major_version) { [7,8,9].sample }
 
   let(:do_register) { true }
 
@@ -216,13 +216,6 @@ describe LogStash::Outputs::ElasticSearch do
             expect(subject.send(:get_event_type, LogStash::Event.new("type" => "foo"))).to eql("_doc")
           end
         end
-
-        context "for 6.x elasticsearch clusters" do
-          let(:maximum_seen_major_version) { 6 }
-          it "should return 'doc'" do
-            expect(subject.send(:get_event_type, LogStash::Event.new("type" => "foo"))).to eql("doc")
-          end
-        end
       end
 
       context "with 'document type set'" do
@@ -694,7 +687,7 @@ describe LogStash::Outputs::ElasticSearch do
           expect{ subject.register }.to raise_error(LogStash::ConfigurationError, /configured while DLQ is not enabled/)
         end
       end
-    end if LOGSTASH_VERSION > '7.0'
+    end
 
     describe "#multi_receive" do
       let(:events) { [double("one"), double("two"), double("three")] }
@@ -915,7 +908,12 @@ describe LogStash::Outputs::ElasticSearch do
       allow(elasticsearch_output_instance.client.pool).to receive(:post) do |path, params, body|
         if body.length > max_bytes
           max_bytes *= 2 # ensure a successful retry
-          double("Response", :code => 413, :body => "")
+          raise ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(
+            413,
+            "test-url",
+            body,
+            ""
+          )
         else
           double("Response", :code => 200, :body => '{"errors":false,"items":[{"index":{"status":200,"result":"created"}}]}')
         end
@@ -1136,7 +1134,7 @@ describe LogStash::Outputs::ElasticSearch do
       it "should not set the retry_on_conflict parameter when creating an event_action_tuple" do
         allow(subject.client).to receive(:maximum_seen_major_version).and_return(maximum_seen_major_version)
         action, params, event_data = subject.send(:event_action_tuple, event)
-        expect(params).not_to include({subject.send(:retry_on_conflict_action_name) => num_retries})
+        expect(params).to_not include({:retry_on_conflict => num_retries})
       end
     end
 
@@ -1145,7 +1143,7 @@ describe LogStash::Outputs::ElasticSearch do
 
       it "should set the retry_on_conflict parameter when creating an event_action_tuple" do
         action, params, event_data = subject.send(:event_action_tuple, event)
-        expect(params).to include({subject.send(:retry_on_conflict_action_name) => num_retries})
+        expect(params).to include({:retry_on_conflict => num_retries})
       end
     end
 
@@ -1154,7 +1152,7 @@ describe LogStash::Outputs::ElasticSearch do
 
       it "should set the retry_on_conflict parameter when creating an event_action_tuple" do
         action, params, event_data = subject.send(:event_action_tuple, event)
-        expect(params).to include({subject.send(:retry_on_conflict_action_name) => num_retries})
+        expect(params).to include({:retry_on_conflict => num_retries})
         expect(action).to eq("update")
       end
     end
@@ -1318,7 +1316,7 @@ describe LogStash::Outputs::ElasticSearch do
         expect { subject.register }.to raise_error LogStash::ConfigurationError, /cloud_id and hosts/
       end
     end
-  end if LOGSTASH_VERSION > '6.0'
+  end
 
   describe "cloud.auth" do
     let(:do_register) { false }
@@ -1359,7 +1357,7 @@ describe LogStash::Outputs::ElasticSearch do
         expect { subject.register }.to raise_error LogStash::ConfigurationError, /Multiple authentication options are specified/
       end
     end
-  end if LOGSTASH_VERSION > '6.0'
+  end
 
   context 'handling elasticsearch document-level status meant for the DLQ' do
     let(:es_api_action) { "CUSTOM_ACTION" }
@@ -1498,7 +1496,7 @@ describe LogStash::Outputs::ElasticSearch do
         include_examples "should write event to DLQ"
       end
 
-    end if LOGSTASH_VERSION > '7.0'
+    end
   end
 
   describe "custom headers" do
@@ -1676,7 +1674,7 @@ describe LogStash::Outputs::ElasticSearch do
       subject.send :wait_for_successful_connection
 
       expect(logger).to have_received(:error).with(/Unable to retrieve Elasticsearch cluster uuid/i, anything)
-    end if LOGSTASH_VERSION >= '7.0.0'
+    end
 
     it "logs template install failure" do
       allow(subject).to receive(:discover_cluster_uuid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 12.0.1
+  version: 12.0.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -263,11 +263,9 @@ files:
 - lib/logstash/outputs/elasticsearch/ilm.rb
 - lib/logstash/outputs/elasticsearch/license_checker.rb
 - lib/logstash/outputs/elasticsearch/template_manager.rb
-- lib/logstash/outputs/elasticsearch/templates/ecs-disabled/elasticsearch-6x.json
 - lib/logstash/outputs/elasticsearch/templates/ecs-disabled/elasticsearch-7x.json
 - lib/logstash/outputs/elasticsearch/templates/ecs-disabled/elasticsearch-8x.json
 - lib/logstash/outputs/elasticsearch/templates/ecs-disabled/elasticsearch-9x.json
-- lib/logstash/outputs/elasticsearch/templates/ecs-v1/elasticsearch-6x.json
 - lib/logstash/outputs/elasticsearch/templates/ecs-v1/elasticsearch-7x.json
 - lib/logstash/outputs/elasticsearch/templates/ecs-v1/elasticsearch-8x.json
 - lib/logstash/outputs/elasticsearch/templates/ecs-v1/elasticsearch-9x.json
@@ -279,7 +277,6 @@ files:
 - lib/logstash/plugin_mixins/elasticsearch/noop_license_checker.rb
 - logstash-output-elasticsearch.gemspec
 - spec/es_spec_helper.rb
-- spec/fixtures/_nodes/6x.json
 - spec/fixtures/_nodes/7x.json
 - spec/fixtures/htpasswd
 - spec/fixtures/license_check/active.json
@@ -288,7 +285,6 @@ files:
 - spec/fixtures/scripts/painless/scripted_update.painless
 - spec/fixtures/scripts/painless/scripted_update_nested.painless
 - spec/fixtures/scripts/painless/scripted_upsert.painless
-- spec/fixtures/template-with-policy-es6x.json
 - spec/fixtures/template-with-policy-es7x.json
 - spec/fixtures/template-with-policy-es8x.json
 - spec/fixtures/test_certs/GENERATED_AT
@@ -368,7 +364,6 @@ specification_version: 4
 summary: Stores logs in Elasticsearch
 test_files:
 - spec/es_spec_helper.rb
-- spec/fixtures/_nodes/6x.json
 - spec/fixtures/_nodes/7x.json
 - spec/fixtures/htpasswd
 - spec/fixtures/license_check/active.json
@@ -377,7 +372,6 @@ test_files:
 - spec/fixtures/scripts/painless/scripted_update.painless
 - spec/fixtures/scripts/painless/scripted_update_nested.painless
 - spec/fixtures/scripts/painless/scripted_upsert.painless
-- spec/fixtures/template-with-policy-es6x.json
 - spec/fixtures/template-with-policy-es7x.json
 - spec/fixtures/template-with-policy-es8x.json
 - spec/fixtures/test_certs/GENERATED_AT

data/lib/logstash/outputs/elasticsearch/templates/ecs-disabled/elasticsearch-6x.json

@@ -1,45 +0,0 @@
-{
-  "template" : "logstash-*",
-  "version" : 60001,
-  "settings" : {
-    "index.refresh_interval" : "5s"
-  },
-  "mappings" : {
-    "_default_" : {
-      "dynamic_templates" : [ {
-        "message_field" : {
-          "path_match" : "message",
-          "match_mapping_type" : "string",
-          "mapping" : {
-            "type" : "text",
-            "norms" : false
-          }
-        }
-      }, {
-        "string_fields" : {
-          "match" : "*",
-          "match_mapping_type" : "string",
-          "mapping" : {
-            "type" : "text", "norms" : false,
-            "fields" : {
-              "keyword" : { "type": "keyword", "ignore_above": 256 }
-            }
-          }
-        }
-      } ],
-      "properties" : {
-        "@timestamp": { "type": "date"},
-        "@version": { "type": "keyword"},
-        "geoip"  : {
-          "dynamic": true,
-          "properties" : {
-            "ip": { "type": "ip" },
-            "location" : { "type" : "geo_point" },
-            "latitude" : { "type" : "half_float" },
-            "longitude" : { "type" : "half_float" }
-          }
-        }
-      }
-    }
-  }
-}