logstash-output-elasticsearch 11.17.0-java → 11.18.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37124c3a166313a2fb9f3831273def114770178158439a44ebfa1bc1d32f9d0f
-  data.tar.gz: a09fd3ce2c54908fedc14dc2d780bb3ec48d7091d05e2e8fcb5789e4ec1e30b9
+  metadata.gz: b42642e174e8a6f0bf30c67cbdf25e27cc8197f2aeb56cb2268fb11f65426a03
+  data.tar.gz: 26ca32e908ef3d42ec4281259ea9a6bf31746031b12c14ad08fbfd189c069c3b
 SHA512:
-  metadata.gz: caac996badd1bbdeb231fad3f40f96a50386baf78ee356587d5fc5d2b4a095f1073bee417a99aab081c13cb1a18802785abed618dc85db504f56145c620c46b6
-  data.tar.gz: 697a89b810998154a44338e8e73f02351b72afa00fc35e1fc115a22ce5ecfeddd27d29bd8fdf4fb779a3b17fbaa2f4f361a2c30b68c0b5ce0cd49a6edeba1a1d
+  metadata.gz: dd0b5731beb34c4e331a8ea52252c4b53af5d8c62ffb97c106eab961709d0d884a02a228d48a236eee635629d23a6c2243528a20e3f1f7368f609e232f26d7f7
+  data.tar.gz: 79e980b61c3bdd1b3339f1f03eccff4c52fe596fc34e6069fac1239a5c67e17357d118a95d9536bc1937f930f1c60f935858c236447f5b87f8517ec9b79ef53e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 11.18.0
+  - Added request header `Elastic-Api-Version` for serverless [#1147](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1147)
+
 ## 11.17.0
   - Added support to http compression level. Deprecated `http_compression` in favour of `compression_level` and enabled compression level 1 by default. [#1148](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1148)
 

data/lib/logstash/outputs/elasticsearch/http_client/pool.rb

@@ -16,6 +16,18 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
         @response_body = response_body
       end
 
+      def invalid_eav_header?
+        @response_code == 400 && @response_body&.include?(ELASTIC_API_VERSION)
+      end
+
+      def invalid_credentials?
+        @response_code == 401
+      end
+
+      def forbidden?
+        @response_code == 403
+      end
+
     end
     class HostUnreachableError < Error;
       attr_reader :original_error, :url
@@ -48,7 +60,9 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       :sniffer_delay => 10,
     }.freeze
 
-    BUILD_FLAVOUR_SERVERLESS = 'serverless'.freeze
+    BUILD_FLAVOR_SERVERLESS = 'serverless'.freeze
+    ELASTIC_API_VERSION = "Elastic-Api-Version".freeze
+    DEFAULT_EAV_HEADER = { ELASTIC_API_VERSION => "2023-10-31" }.freeze
 
     def initialize(logger, adapter, initial_urls=[], options={})
       @logger = logger
@@ -77,7 +91,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       @license_checker = options[:license_checker] || LogStash::PluginMixins::ElasticSearch::NoopLicenseChecker::INSTANCE
 
       @last_es_version = Concurrent::AtomicReference.new
-      @build_flavour = Concurrent::AtomicReference.new
+      @build_flavor = Concurrent::AtomicReference.new
     end
 
     def start
@@ -232,39 +246,56 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
     end
 
     def health_check_request(url)
-      response = perform_request_to_url(url, :head, @healthcheck_path)
-      raise BadResponseCodeError.new(response.code, url, nil, response.body) unless (200..299).cover?(response.code)
+      logger.debug("Running health check to see if an Elasticsearch connection is working",
+                   :healthcheck_url => url.sanitized.to_s, :path => @healthcheck_path)
+      begin
+        response = perform_request_to_url(url, :head, @healthcheck_path)
+        return response, nil
+      rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError => e
+        logger.warn("Health check failed", code: e.response_code, url: e.url, message: e.message)
+        return nil, e
+      end
     end
 
     def healthcheck!(register_phase = true)
       # Try to keep locking granularity low such that we don't affect IO...
       @state_mutex.synchronize { @url_info.select {|url,meta| meta[:state] != :alive } }.each do |url,meta|
         begin
-          logger.debug("Running health check to see if an Elasticsearch connection is working",
-                        :healthcheck_url => url.sanitized.to_s, :path => @healthcheck_path)
-          health_check_request(url)
+          _, health_bad_code_err = health_check_request(url)
+          root_response, root_bad_code_err = get_root_path(url) if health_bad_code_err.nil? || register_phase
 
           # when called from resurrectionist skip the product check done during register phase
           if register_phase
-            if !elasticsearch?(url)
-              raise LogStash::ConfigurationError, "Could not connect to a compatible version of Elasticsearch"
-            end
+            raise LogStash::ConfigurationError,
+                  "Could not read Elasticsearch. Please check the credentials" if root_bad_code_err&.invalid_credentials?
+            raise LogStash::ConfigurationError,
+                  "Could not read Elasticsearch. Please check the privileges" if root_bad_code_err&.forbidden?
+            # when customer_headers is invalid
+            raise LogStash::ConfigurationError,
+                  "The Elastic-Api-Version header is not valid" if root_bad_code_err&.invalid_eav_header?
+            # when it is not Elasticserach
+            raise LogStash::ConfigurationError,
+                  "Could not connect to a compatible version of Elasticsearch" if root_bad_code_err.nil? && !elasticsearch?(root_response)
+
+            test_serverless_connection(url, root_response)
           end
+
+          raise health_bad_code_err if health_bad_code_err
+          raise root_bad_code_err if root_bad_code_err
+
           # If no exception was raised it must have succeeded!
           logger.warn("Restored connection to ES instance", url: url.sanitized.to_s)
-          # We reconnected to this node, check its ES version
-          version_info = get_es_version(url)
-          es_version = version_info.fetch('number', nil)
-          build_flavour = version_info.fetch('build_flavor', nil)
-
-          if es_version.nil?
-            logger.warn("Failed to retrieve Elasticsearch version data from connected endpoint, connection aborted", :url => url.sanitized.to_s)
-            next
-          end
+
+          # We check its ES version
+          es_version, build_flavor = parse_es_version(root_response)
+          logger.warn("Failed to retrieve Elasticsearch build flavor") if build_flavor.nil?
+          logger.warn("Failed to retrieve Elasticsearch version data from connected endpoint, connection aborted", :url => url.sanitized.to_s) if es_version.nil?
+          next if es_version.nil?
+
           @state_mutex.synchronize do
             meta[:version] = es_version
             set_last_es_version(es_version, url)
-            set_build_flavour(build_flavour)
+            set_build_flavor(build_flavor)
 
             alive = @license_checker.appropriate_license?(self, url)
             meta[:state] = alive ? :alive : :dead
@@ -275,40 +306,21 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       end
     end
 
-    def elasticsearch?(url)
+    def get_root_path(url, params={})
       begin
-        response = perform_request_to_url(url, :get, ROOT_URI_PATH)
+        resp = perform_request_to_url(url, :get, ROOT_URI_PATH, params)
+        return resp, nil
       rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError => e
-        return false if response.code == 401 || response.code == 403
-        raise e
+        logger.warn("Elasticsearch main endpoint returns #{e.response_code}", message: e.message, body: e.response_body)
+        return nil, e
       end
-
-      version_info = LogStash::Json.load(response.body)
-      return false if version_info['version'].nil?
-
-      version = ::Gem::Version.new(version_info["version"]['number'])
-      return false if version < ::Gem::Version.new('6.0.0')
-
-      if VERSION_6_TO_7.satisfied_by?(version)
-        return valid_tagline?(version_info)
-      elsif VERSION_7_TO_7_14.satisfied_by?(version)
-        build_flavor = version_info["version"]['build_flavor']
-        return false if build_flavor.nil? || build_flavor != 'default' || !valid_tagline?(version_info)
-      else
-        # case >= 7.14
-        lower_headers = response.headers.transform_keys {|key| key.to_s.downcase }
-        product_header = lower_headers['x-elastic-product']
-        return false if product_header != 'Elasticsearch'
-      end
-      return true
-    rescue => e
-      logger.error("Unable to retrieve Elasticsearch version", url: url.sanitized.to_s, exception: e.class, message: e.message)
-      false
     end
 
-    def valid_tagline?(version_info)
-      tagline = version_info['tagline']
-      tagline == "You Know, for Search"
+    def test_serverless_connection(url, root_response)
+      _, build_flavor = parse_es_version(root_response)
+      params = { :headers => DEFAULT_EAV_HEADER }
+      _, bad_code_err = get_root_path(url, params) if build_flavor == BUILD_FLAVOR_SERVERLESS
+      raise LogStash::ConfigurationError, "The Elastic-Api-Version header is not valid" if bad_code_err&.invalid_eav_header?
     end
 
     def stop_resurrectionist
@@ -334,6 +346,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
     end
 
     def perform_request_to_url(url, method, path, params={}, body=nil)
+      params[:headers] = DEFAULT_EAV_HEADER.merge(params[:headers] || {}) if serverless?
       @adapter.perform_request(url, method, path, params, body)
     end
 
@@ -476,15 +489,6 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       end
     end
 
-    def get_es_version(url)
-      response = perform_request_to_url(url, :get, ROOT_URI_PATH)
-      return nil unless (200..299).cover?(response.code)
-
-      response = LogStash::Json.load(response.body)
-
-      response.fetch('version', {})
-    end
-
     def last_es_version
       @last_es_version.get
     end
@@ -494,7 +498,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
     end
 
     def serverless?
-      @build_flavour.get == BUILD_FLAVOUR_SERVERLESS
+      @build_flavor.get == BUILD_FLAVOR_SERVERLESS
     end
 
     private
@@ -526,9 +530,50 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
                    previous_major: @maximum_seen_major_version, new_major: major, node_url: url.sanitized.to_s)
     end
 
-    def set_build_flavour(flavour)
-      @build_flavour.set(flavour)
+    def set_build_flavor(flavor)
+      @build_flavor.set(flavor)
+    end
+
+    def parse_es_version(response)
+      return nil, nil unless (200..299).cover?(response&.code)
+
+      response = LogStash::Json.load(response&.body)
+      version_info = response.fetch('version', {})
+      es_version = version_info.fetch('number', nil)
+      build_flavor = version_info.fetch('build_flavor', nil)
+
+      return es_version, build_flavor
+    end
+
+    def elasticsearch?(response)
+      return false if response.nil?
+
+      version_info = LogStash::Json.load(response.body)
+      return false if version_info['version'].nil?
+
+      version = ::Gem::Version.new(version_info["version"]['number'])
+      return false if version < ::Gem::Version.new('6.0.0')
+
+      if VERSION_6_TO_7.satisfied_by?(version)
+        return valid_tagline?(version_info)
+      elsif VERSION_7_TO_7_14.satisfied_by?(version)
+        build_flavor = version_info["version"]['build_flavor']
+        return false if build_flavor.nil? || build_flavor != 'default' || !valid_tagline?(version_info)
+      else
+        # case >= 7.14
+        lower_headers = response.headers.transform_keys {|key| key.to_s.downcase }
+        product_header = lower_headers['x-elastic-product']
+        return false if product_header != 'Elasticsearch'
+      end
+      return true
+    rescue => e
+      logger.error("Unable to retrieve Elasticsearch version", exception: e.class, message: e.message)
+      false
     end
 
+    def valid_tagline?(version_info)
+      tagline = version_info['tagline']
+      tagline == "You Know, for Search"
+    end
   end
 end; end; end; end;

data/lib/logstash/outputs/elasticsearch/http_client.rb

@@ -209,7 +209,7 @@ module LogStash; module Outputs; class ElasticSearch;
     end
 
     def get(path)
-      response = @pool.get(path, nil)
+      response = @pool.get(path)
       LogStash::Json.load(response.body)
     end
 

data/lib/logstash/outputs/elasticsearch.rb

@@ -596,7 +596,9 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   def install_template
     TemplateManager.install_template(self)
   rescue => e
-    @logger.error("Failed to install template", message: e.message, exception: e.class, backtrace: e.backtrace)
+    details = { message: e.message, exception: e.class, backtrace: e.backtrace }
+    details[:body] = e.response_body if e.respond_to?(:response_body)
+    @logger.error("Failed to install template", details)
   end
 
   def setup_ecs_compatibility_related_defaults

data/lib/logstash/plugin_mixins/elasticsearch/common.rb

@@ -179,7 +179,9 @@ module LogStash; module PluginMixins; module ElasticSearch
       cluster_info = client.get('/')
       plugin_metadata.set(:cluster_uuid, cluster_info['cluster_uuid'])
     rescue => e
-      @logger.error("Unable to retrieve Elasticsearch cluster uuid", message: e.message, exception: e.class, backtrace: e.backtrace)
+      details = { message: e.message, exception: e.class, backtrace: e.backtrace }
+      details[:body] = e.response_body if e.respond_to?(:response_body)
+      @logger.error("Unable to retrieve Elasticsearch cluster uuid", details)
     end
 
     def retrying_submit(actions)

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '11.17.0'
+  s.version         = '11.18.0'
   s.licenses        = ['apache-2.0']
   s.summary         = "Stores logs in Elasticsearch"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

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

@@ -7,8 +7,14 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
   let(:adapter) { LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter.new(logger, {}) }
   let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200")] }
   let(:options) { {:resurrect_delay => 3, :url_normalizer => proc {|u| u}} } # Shorten the delay a bit to speed up tests
-  let(:es_version_info) { [ { "number" => '0.0.0', "build_flavor" => 'default'} ] }
   let(:license_status) { 'active' }
+  let(:root_response) { MockResponse.new(200,
+                                          {"tagline" => "You Know, for Search",
+                                           "version" => {
+                                             "number" => '8.9.0',
+                                             "build_flavor" => 'default'} },
+                                          { "X-Elastic-Product" => "Elasticsearch" }
+  ) }
 
   subject { described_class.new(logger, adapter, initial_urls, options) }
 
@@ -22,7 +28,6 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
 
     allow(::Manticore::Client).to receive(:new).and_return(manticore_double)
 
-    allow(subject).to receive(:get_es_version).with(any_args).and_return(*es_version_info)
     allow(subject.license_checker).to receive(:license_status).and_return(license_status)
   end
 
@@ -37,35 +42,42 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
     end
   end
 
-  describe "the resurrectionist" do
-    before(:each) { subject.start }
-    it "should start the resurrectionist when created" do
-      expect(subject.resurrectionist_alive?).to eql(true)
-    end
+  describe "healthcheck" do
 
-    it "should attempt to resurrect connections after the ressurrect delay" do
-      expect(subject).to receive(:healthcheck!).once
-      sleep(subject.resurrect_delay + 1)
+    describe "the resurrectionist" do
+      before(:each) { subject.start }
+      it "should start the resurrectionist when created" do
+        expect(subject.resurrectionist_alive?).to eql(true)
+      end
+
+      it "should attempt to resurrect connections after the ressurrect delay" do
+        expect(subject).to receive(:healthcheck!).once
+        sleep(subject.resurrect_delay + 1)
+      end
     end
 
-    describe "healthcheck url handling" do
+    describe "healthcheck path handling" do
       let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200")] }
-      let(:success_response) { double("Response", :code => 200) }
+      let(:healthcheck_response) { double("Response", :code => 200) }
 
       before(:example) do
+        subject.start
+
+        expect(adapter).to receive(:perform_request).with(anything, :head, eq(healthcheck_path), anything, anything) do |url, _, _, _, _|
+          expect(url.path).to be_empty
+          healthcheck_response
+        end
+
         expect(adapter).to receive(:perform_request).with(anything, :get, "/", anything, anything) do |url, _, _, _, _|
           expect(url.path).to be_empty
+          root_response
         end
       end
 
       context "and not setting healthcheck_path" do
+        let(:healthcheck_path) { "/" }
         it "performs the healthcheck to the root" do
-          expect(adapter).to receive(:perform_request).with(anything, :head, "/", anything, anything) do |url, _, _, _, _|
-            expect(url.path).to be_empty
-
-            success_response
-          end
-          expect { subject.healthcheck! }.to raise_error(LogStash::ConfigurationError, "Could not connect to a compatible version of Elasticsearch")
+          subject.healthcheck!
         end
       end
 
@@ -73,14 +85,116 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
         let(:healthcheck_path) { "/my/health" }
         let(:options) { super().merge(:healthcheck_path => healthcheck_path) }
         it "performs the healthcheck to the healthcheck_path" do
-          expect(adapter).to receive(:perform_request).with(anything, :head, eq(healthcheck_path), anything, anything) do |url, _, _, _, _|
-            expect(url.path).to be_empty
+          subject.healthcheck!
+        end
+      end
+    end
+
+    describe "register phase" do
+      shared_examples_for "root path returns bad code error" do |err_msg|
+        before :each do
+          subject.update_initial_urls
+          expect(subject).to receive(:elasticsearch?).never
+        end
+
+        it "raises ConfigurationError" do
+          expect(subject).to receive(:health_check_request).with(anything).and_return(["", nil])
+          expect(subject).to receive(:get_root_path).with(anything).and_return([nil,
+                                                                                ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(mock_resp.code, nil, nil, mock_resp.body)])
+          expect { subject.healthcheck! }.to raise_error(LogStash::ConfigurationError, err_msg)
+        end
+      end
+
+      context "with 200 without version" do
+        let(:mock_resp) { MockResponse.new(200, {"tagline" => "You Know, for Search"}) }
 
-            success_response
-          end
+        it "raises ConfigurationError" do
+          subject.update_initial_urls
+
+          expect(subject).to receive(:health_check_request).with(anything).and_return(["", nil])
+          expect(subject).to receive(:get_root_path).with(anything).and_return([mock_resp, nil])
           expect { subject.healthcheck! }.to raise_error(LogStash::ConfigurationError, "Could not connect to a compatible version of Elasticsearch")
         end
       end
+
+      context "with 200 serverless" do
+        let(:good_resp) { MockResponse.new(200,
+                                           { "tagline" => "You Know, for Search",
+                                             "version" => { "number" => '8.10.0', "build_flavor" => 'serverless'}
+                                           },
+                                           { "X-Elastic-Product" => "Elasticsearch" }
+        ) }
+        let(:bad_400_err) do
+          ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(400,
+           nil, nil,
+           "The requested [Elastic-Api-Version] header value of [2024-10-31] is not valid. Only [2023-10-31] is supported")
+        end
+
+        it "raises ConfigurationError when the serverless connection test fails" do
+          subject.update_initial_urls
+
+          expect(subject).to receive(:health_check_request).with(anything).and_return(["", nil])
+          expect(subject).to receive(:get_root_path).with(anything).and_return([good_resp, nil])
+          expect(subject).to receive(:get_root_path).with(anything, hash_including(:headers => LogStash::Outputs::ElasticSearch::HttpClient::Pool::DEFAULT_EAV_HEADER)).and_return([nil, bad_400_err])
+          expect { subject.healthcheck! }.to raise_error(LogStash::ConfigurationError, "The Elastic-Api-Version header is not valid")
+        end
+
+        it "passes when the serverless connection test succeeds" do
+          subject.update_initial_urls
+
+          expect(subject).to receive(:health_check_request).with(anything).and_return(["", nil])
+          expect(subject).to receive(:get_root_path).with(anything).and_return([good_resp, nil])
+          expect(subject).to receive(:get_root_path).with(anything, hash_including(:headers => LogStash::Outputs::ElasticSearch::HttpClient::Pool::DEFAULT_EAV_HEADER)).and_return([good_resp, nil])
+          expect { subject.healthcheck! }.not_to raise_error
+        end
+      end
+
+      context "with 200 default" do
+        let(:good_resp) { MockResponse.new(200,
+                                           { "tagline" => "You Know, for Search",
+                                             "version" => { "number" => '8.10.0', "build_flavor" => 'default'}
+                                           },
+                                           { "X-Elastic-Product" => "Elasticsearch" }
+        ) }
+
+        it "passes without checking serverless connection" do
+          subject.update_initial_urls
+
+          expect(subject).to receive(:health_check_request).with(anything).and_return(["", nil])
+          expect(subject).to receive(:get_root_path).with(anything).and_return([good_resp, nil])
+          expect(subject).not_to receive(:get_root_path).with(anything, hash_including(:headers => LogStash::Outputs::ElasticSearch::HttpClient::Pool::DEFAULT_EAV_HEADER))
+          expect { subject.healthcheck! }.not_to raise_error
+        end
+      end
+
+      context "with 400" do
+        let(:mock_resp) { MockResponse.new(400, "The requested [Elastic-Api-Version] header value of [2024-10-31] is not valid. Only [2023-10-31] is supported") }
+        it_behaves_like "root path returns bad code error", "The Elastic-Api-Version header is not valid"
+      end
+
+      context "with 401" do
+        let(:mock_resp) { MockResponse.new(401, "missing authentication") }
+        it_behaves_like "root path returns bad code error", "Could not read Elasticsearch. Please check the credentials"
+      end
+
+      context "with 403" do
+        let(:mock_resp) { MockResponse.new(403, "Forbidden") }
+        it_behaves_like "root path returns bad code error", "Could not read Elasticsearch. Please check the privileges"
+      end
+    end
+
+    describe "non register phase" do
+      let(:health_bad_code_err) { ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(400, nil, nil, nil) }
+
+      before :each do
+        subject.update_initial_urls
+      end
+
+      it "does not call root path when health check request fails" do
+        expect(subject).to receive(:health_check_request).with(anything).and_return(["", health_bad_code_err])
+        expect(subject).to receive(:get_root_path).never
+        subject.healthcheck!(false)
+      end
     end
   end
 
@@ -251,23 +365,23 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
       ::LogStash::Util::SafeURI.new("http://otherhost:9201")
     ] }
 
-    let(:valid_response) { MockResponse.new(200, {"tagline" => "You Know, for Search",
-                                                          "version" => {
-                                                            "number" => '7.13.0',
-                                                            "build_flavor" => 'default'}
-                                                          }) }
-
-    before(:each) do
-      allow(subject).to receive(:perform_request_to_url).and_return(valid_response)
-      subject.start
-    end
-
-    it "picks the largest major version" do
-      expect(subject.maximum_seen_major_version).to eq(0)
-    end
+    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',
+                                                    "build_flavor" => 'default'}
+    }) }
 
     context "if there are nodes with multiple major versions" do
-      let(:es_version_info) { [ { "number" => '0.0.0', "build_flavor" => 'default'}, { "number" => '6.0.0', "build_flavor" => 'default'} ] }
+      before(:each) do
+        allow(subject).to receive(:perform_request_to_url).and_return(root_response, root_response2)
+        subject.start
+      end
+
       it "picks the largest major version" do
         expect(subject.maximum_seen_major_version).to eq(6)
       end
@@ -275,32 +389,31 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
   end
 
 
-  describe "build flavour tracking" do
+  describe "build flavor tracking" do
     let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://somehost:9200")] }
 
-    let(:es_version_info) { [ { "number" => '8.9.0', "build_flavor" => "serverless" } ] }
-
-    let(:valid_response) { MockResponse.new(200,
+    let(:root_response) { MockResponse.new(200,
                                             {"tagline" => "You Know, for Search",
                                                   "version" => {
                                                     "number" => '8.9.0',
-                                                    "build_flavor" => LogStash::Outputs::ElasticSearch::HttpClient::Pool::BUILD_FLAVOUR_SERVERLESS} },
+                                                    "build_flavor" => LogStash::Outputs::ElasticSearch::HttpClient::Pool::BUILD_FLAVOR_SERVERLESS} },
                                             { "X-Elastic-Product" => "Elasticsearch" }
     ) }
 
     before(:each) do
-      allow(subject).to receive(:perform_request_to_url).and_return(valid_response)
+      allow(subject).to receive(:perform_request_to_url).and_return(root_response)
       subject.start
     end
 
-    it "picks the build flavour" do
+    it "picks the build flavor" do
       expect(subject.serverless?).to be_truthy
     end
   end
 
   describe "license checking" do
     before(:each) do
-      allow(subject).to receive(:health_check_request)
+      allow(subject).to receive(:health_check_request).and_return(["", nil])
+      allow(subject).to receive(:perform_request_to_url).and_return(root_response)
       allow(subject).to receive(:elasticsearch?).and_return(true)
     end
 
@@ -327,6 +440,36 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
     end
   end
 
+  describe "elastic api version header" do
+    let(:eav) { "Elastic-Api-Version" }
+
+    context "when it is serverless" do
+      before(:each) do
+        expect(subject).to receive(:serverless?).and_return(true)
+      end
+
+      it "add the default header" do
+        expect(adapter).to receive(:perform_request).with(anything, :get, "/", anything, anything) do |_, _, _, params, _|
+          expect(params[:headers]).to eq({ "User-Agent" => "chromium",  "Elastic-Api-Version" => "2023-10-31"})
+        end
+        subject.perform_request_to_url(initial_urls, :get, "/", { :headers => { "User-Agent" => "chromium" }} )
+      end
+    end
+
+    context "when it is stateful" do
+      before(:each) do
+        expect(subject).to receive(:serverless?).and_return(false)
+      end
+
+      it "add the default header" do
+        expect(adapter).to receive(:perform_request).with(anything, :get, "/", anything, anything) do |_, _, _, params, _|
+          expect(params[:headers]).to be_nil
+        end
+        subject.perform_request_to_url(initial_urls, :get, "/" )
+      end
+    end
+  end
+
   # TODO: extract to ElasticSearchOutputLicenseChecker unit spec
   describe "license checking with ElasticSearchOutputLicenseChecker" do
     let(:options) do
@@ -334,7 +477,8 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
     end
 
     before(:each) do
-      allow(subject).to receive(:health_check_request)
+      allow(subject).to receive(:health_check_request).and_return(["", nil])
+      allow(subject).to receive(:perform_request_to_url).and_return(root_response)
       allow(subject).to receive(:elasticsearch?).and_return(true)
     end
 
@@ -388,114 +532,71 @@ describe "#elasticsearch?" do
   let(:adapter) { double("Manticore Adapter") }
   let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200")] }
   let(:options) { {:resurrect_delay => 2, :url_normalizer => proc {|u| u}} } # Shorten the delay a bit to speed up tests
-  let(:es_version_info) { [{ "number" => '0.0.0', "build_flavor" => 'default'}] }
-  let(:license_status) { 'active' }
 
   subject { LogStash::Outputs::ElasticSearch::HttpClient::Pool.new(logger, adapter, initial_urls, options) }
 
-  let(:url) { ::LogStash::Util::SafeURI.new("http://localhost:9200") }
-
-  context "in case HTTP error code" do
-    it "should fail for 401" do
-      allow(adapter).to receive(:perform_request)
-        .with(anything, :get, "/", anything, anything)
-        .and_return(MockResponse.new(401))
-
-      expect(subject.elasticsearch?(url)).to be false
-    end
-
-    it "should fail for 403" do
-      allow(adapter).to receive(:perform_request)
-              .with(anything, :get, "/", anything, anything)
-              .and_return(status: 403)
-      expect(subject.elasticsearch?(url)).to be false
-    end
-  end
-
   context "when connecting to a cluster which reply without 'version' field" do
     it "should fail" do
-      allow(adapter).to receive(:perform_request)
-                    .with(anything, :get, "/", anything, anything)
-                    .and_return(body: {"field" => "funky.com"}.to_json)
-      expect(subject.elasticsearch?(url)).to be false
+      resp = MockResponse.new(200, {"field" => "funky.com"} )
+      expect(subject.send(:elasticsearch?, resp)).to be false
     end
   end
 
   context "when connecting to a cluster with version < 6.0.0" do
     it "should fail" do
-      allow(adapter).to receive(:perform_request)
-                          .with(anything, :get, "/", anything, anything)
-                          .and_return(200, {"version" => { "number" => "5.0.0"}}.to_json)
-      expect(subject.elasticsearch?(url)).to be false
+      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
-      allow(adapter).to receive(:perform_request)
-                                .with(anything, :get, "/", anything, anything)
-                                .and_return(MockResponse.new(200, {"version" => {"number" => "6.5.0"}, "tagline" => "You Know, for Search"}))
-      expect(subject.elasticsearch?(url)).to be true
+      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
-      allow(adapter).to receive(:perform_request)
-                                .with(anything, :get, "/", anything, anything)
-                                .and_return(MockResponse.new(200, {"version" => {"number" => "6.5.0"}, "tagline" => "You don't know"}))
-      expect(subject.elasticsearch?(url)).to be false
+      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
-      allow(adapter).to receive(:perform_request)
-                                .with(anything, :get, "/", anything, anything)
-                                .and_return(MockResponse.new(200, {"version" => {"number" => "6.5.0"}}))
-      expect(subject.elasticsearch?(url)).to be false
+      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
-      allow(adapter).to receive(:perform_request)
-                                .with(anything, :get, "/", anything, anything)
-                                .and_return(MockResponse.new(200, {"version": {"number": "7.5.0", "build_flavor": "default"}, "tagline": "You Know, for Search"}))
-      expect(subject.elasticsearch?(url)).to be true
+      resp = MockResponse.new(200, {"version": {"number": "7.5.0", "build_flavor": "default"}, "tagline": "You Know, for Search"} )
+      expect(subject.send(:elasticsearch?, resp)).to be true
     end
 
     it "should fail if 'build_flavor' is not 'default' and tagline is correct" do
-      allow(adapter).to receive(:perform_request)
-                                .with(anything, :get, "/", anything, anything)
-                                .and_return(MockResponse.new(200, {"version": {"number": "7.5.0", "build_flavor": "oss"}, "tagline": "You Know, for Search"}))
-      expect(subject.elasticsearch?(url)).to be false
+      resp = MockResponse.new(200, {"version": {"number": "7.5.0", "build_flavor": "oss"}, "tagline": "You Know, for Search"} )
+      expect(subject.send(:elasticsearch?, resp)).to be false
     end
 
     it "should fail if 'build_flavor' is not present and tagline is correct" do
-      allow(adapter).to receive(:perform_request)
-                                .with(anything, :get, "/", anything, anything)
-                                .and_return(MockResponse.new(200, {"version": {"number": "7.5.0"}, "tagline": "You Know, for Search"}))
-      expect(subject.elasticsearch?(url)).to be false
+      resp = MockResponse.new(200, {"version": {"number": "7.5.0"}, "tagline": "You Know, for Search"} )
+      expect(subject.send(:elasticsearch?, resp)).to be false
     end
   end
 
   context "when connecting to a cluster with version >= 7.14.0" do
     it "should fail if 'X-elastic-product' header is not present" do
-      allow(adapter).to receive(:perform_request)
-                    .with(anything, :get, "/", anything, anything)
-                    .and_return(MockResponse.new(200, {"version": {"number": "7.14.0"}}))
-      expect(subject.elasticsearch?(url)).to be false
+      resp = MockResponse.new(200, {"version": {"number": "7.14.0"}} )
+      expect(subject.send(:elasticsearch?, resp)).to be false
     end
 
     it "should fail if 'X-elastic-product' header is present but with bad value" do
-      allow(adapter).to receive(:perform_request)
-                    .with(anything, :get, "/", anything, anything)
-                    .and_return(MockResponse.new(200, {"version": {"number": "7.14.0"}}, {'X-elastic-product' => 'not good'}))
-      expect(subject.elasticsearch?(url)).to be false
+      resp = MockResponse.new(200, {"version": {"number": "7.14.0"}}, {'X-elastic-product' => 'not good'} )
+      expect(subject.send(:elasticsearch?, resp)).to be false
     end
 
     it "must be successful when 'X-elastic-product' header is present with 'Elasticsearch' value" do
-      allow(adapter).to receive(:perform_request)
-                    .with(anything, :get, "/", anything, anything)
-                    .and_return(MockResponse.new(200, {"version": {"number": "7.14.0"}}, {'X-elastic-product' => 'Elasticsearch'}))
-      expect(subject.elasticsearch?(url)).to be true
+      resp = MockResponse.new(200, {"version": {"number": "7.14.0"}}, {'X-elastic-product' => 'Elasticsearch'} )
+      expect(subject.send(:elasticsearch?, resp)).to be true
     end
   end
 end

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

@@ -135,7 +135,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
     }
 
     it "returns the hash response" do
-      expect(subject.pool).to receive(:get).with(path, nil).and_return(get_response)
+      expect(subject.pool).to receive(:get).with(path).and_return(get_response)
       expect(subject.get(path)["body"]).to eq(body)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 11.17.0
+  version: 11.18.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement