logstash-input-elasticsearch 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90dc46d1bcadf70173792a9c2319925ea5e78bd3e6322e7c323de178afb72fa4
-  data.tar.gz: 21548a5935b0aa5b153b6e1bc00c7f9f3f6ade7f6546a0beb0ce7cc6cef5a984
+  metadata.gz: a9727073ca11cfa69a6f7c7b2f697ddf5867cef0bba4d4e4516eb32aad0dfcd0
+  data.tar.gz: f48cdc3e58b58bf3d06e56edb7887b61f8a7d3b9ea01492cae2ba300d91c9a0a
 SHA512:
-  metadata.gz: 59e8a03c25d8ee9a1a02014b75d1096b81250b85c7f6bd7e78114764534d9ad244d5d758e974c84bc20d9aa0c8fad669a3ef636b17037426c30f2705d74083d2
-  data.tar.gz: 8b986365b25b8884e3aae581b37ce35f9190e50bf3ce4d17263887c31721efe16f16b97dcf2571dcb446991f7ea4406c6011a1d1dbd3afd7f3e07ec0c4b9b743
+  metadata.gz: 7f0266cbad4a06a7c65bf33dcc4bf79a58a5fd43da7ad7ee007298f9492a23dd939c73dff55eb1880ee6a4f88299946f8b5f113a8267e529cbafb00d417e4ccc
+  data.tar.gz: 8ae4f0721c282efa2f3384047d94aa0494adf17feb8a6061563fd65b99d6a040ebf0654d36a0f67ab41668e438d087f9473adc30a539f04eec0dc4eb9d984bb5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.3.1
+  - Fix serverless request failure caused by conflicting `compatible-with` and `Elastic-Api-Version` headers when using elasticsearch-ruby v9 [#269](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/269)
+
 ## 5.3.0
   - Drop a support for Logstash 7.x by requiring elasticsearch gem >= 8. Logstash 8+ continues to work as before [#252](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/252)
 

data/lib/logstash/inputs/elasticsearch.rb

@@ -331,31 +331,7 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
     validate_authentication
     fill_user_password_from_cloud_auth
 
-    transport_options = {:headers => {}}
-    transport_options[:headers].merge!(INTERNAL_ORIGIN_HEADER)
-    transport_options[:headers].merge!(setup_basic_auth(user, password))
-    transport_options[:headers].merge!(setup_api_key(api_key))
-    transport_options[:headers].merge!({'user-agent' => prepare_user_agent()})
-    transport_options[:headers].merge!(@custom_headers) unless @custom_headers.empty?
-    transport_options[:request_timeout] = @request_timeout_seconds unless @request_timeout_seconds.nil?
-    transport_options[:connect_timeout] = @connect_timeout_seconds unless @connect_timeout_seconds.nil?
-    transport_options[:socket_timeout]  = @socket_timeout_seconds  unless @socket_timeout_seconds.nil?
-
-    hosts = setup_hosts
-    ssl_options = setup_client_ssl
-
-    @logger.warn "Supplied proxy setting (proxy => '') has no effect" if @proxy.eql?('')
-
-    transport_options[:proxy] = @proxy.to_s if @proxy && !@proxy.eql?('')
-
-    @client_options = {
-      :hosts => hosts,
-      :transport_options => transport_options,
-      :transport_class => ::Elastic::Transport::Transport::HTTP::Manticore,
-      :ssl => ssl_options
-    }
-
-    @client = Elasticsearch::Client.new(@client_options)
+    @client = new_client
 
     test_connection!
 
@@ -641,6 +617,31 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
   # @private used by unit specs
   attr_reader :client
 
+  def new_client(serverless: false)
+    headers = {}
+    headers.merge!(INTERNAL_ORIGIN_HEADER)
+    headers.merge!(setup_basic_auth(user, password))
+    headers.merge!(setup_api_key(api_key))
+    headers.merge!({'user-agent' => prepare_user_agent()})
+    headers.merge!(@custom_headers) unless @custom_headers.empty?
+    headers.merge!(DEFAULT_EAV_HEADER) if serverless
+
+    transport_options = { headers: headers }
+    transport_options[:request_timeout] = @request_timeout_seconds unless @request_timeout_seconds.nil?
+    transport_options[:connect_timeout] = @connect_timeout_seconds unless @connect_timeout_seconds.nil?
+    transport_options[:socket_timeout]  = @socket_timeout_seconds  unless @socket_timeout_seconds.nil?
+
+    @logger.warn "Supplied proxy setting (proxy => '') has no effect" if @proxy.eql?('')
+    transport_options[:proxy] = @proxy.to_s if @proxy && !@proxy.eql?('')
+
+    Elasticsearch::Client.new(
+      hosts: setup_hosts,
+      transport_options: transport_options,
+      transport_class: ::Elastic::Transport::Transport::HTTP::Manticore,
+      ssl: setup_client_ssl
+    )
+  end
+
   def test_connection!
     @client.ping
   rescue Elasticsearch::UnsupportedProductError
@@ -663,8 +664,7 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
   # verify the header by sending GET /
   def setup_serverless
     if serverless?
-      @client_options[:transport_options][:headers].merge!(DEFAULT_EAV_HEADER)
-      @client = Elasticsearch::Client.new(@client_options)
+      @client = new_client(serverless: true)
       @client.info
     end
   rescue => e

data/logstash-input-elasticsearch.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
+  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "version", "docs/**/*"]
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})

data/version

@@ -0,0 +1 @@
+5.3.1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -283,6 +283,7 @@ files:
 - spec/inputs/integration/elasticsearch_esql_spec.rb
 - spec/inputs/integration/elasticsearch_spec.rb
 - spec/inputs/paginated_search_spec.rb
+- version
 homepage: https://elastic.co/logstash
 licenses:
 - Apache License (2.0)
@@ -303,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Reads query results from an Elasticsearch cluster
 test_files: