logstash-output-elasticsearch 11.22.15-java → 11.22.16-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b7ec8d5dbede6389a4e59f97d8e98c812091e9f9a1f49ed11a443c4c7b4a6b
-  data.tar.gz: e0a1b09ca555fed7cd9340ce843e837b3abb0ceb0d21a577d43a3b89462042cc
+  metadata.gz: 879ff0b99e2d13691ade229384790bc4372e083396cbb777587b2463d8fa05c1
+  data.tar.gz: c2cc01a0602371c908857832bbf712d2297d0383ffb45e893af2c44e97cd4121
 SHA512:
-  metadata.gz: 14dd08f7aa74dee3c9cadb7ff96a86a0e65e4fcb425b1292749005faac2e7153a580ab6212dabb7664f1d83997404993ec1a2f0f9efdabd834aecd5447b728f8
-  data.tar.gz: 1c21dd49841e4f05ddaca95e7a3f91bb9d7e9c3ee9887249ef2b365c3066db666645b3b508a173c2c9fa55256c906fa202068b2942646cac8e2cc1e3ab444b65
+  metadata.gz: b3411e69c6aa2798b92cde0d242b8952a79b438c9e4875a40aaf39017c5120978c24378fff986f0d65f6a2b7dad7be6c69b65760b096bae443307448e7be6a59
+  data.tar.gz: cbbbcb50f322e298a05e1d381344555137431cb45e34de65e26d2318c3db28ecb3945921fec036f2fb30ffedd6313ce5b9256160a9d8a4025f69243cfddd80ab

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 11.22.16
+ - Fix serverless compatibility: guard against nil params in pool requests and strip unsupported template settings (number_of_shards, number_of_replicas) on serverless
+
 ## 11.22.15
  - Improves the logging experience when DLQ used [#1258](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1258)
 

data/README.md

@@ -1,6 +1,8 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-output-elasticsearch.svg)](https://travis-ci.com/logstash-plugins/logstash-output-elasticsearch)
+[![Unit Tests](https://github.com/logstash-plugins/logstash-output-elasticsearch/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/logstash-plugins/logstash-output-elasticsearch/actions/workflows/unit-tests.yml)
+[![Integration Tests](https://github.com/logstash-plugins/logstash-output-elasticsearch/actions/workflows/integration-tests.yml/badge.svg)](https://github.com/logstash-plugins/logstash-output-elasticsearch/actions/workflows/integration-tests.yml)
+[![Secure Integration Tests](https://github.com/logstash-plugins/logstash-output-elasticsearch/actions/workflows/secure-integration-tests.yml/badge.svg)](https://github.com/logstash-plugins/logstash-output-elasticsearch/actions/workflows/secure-integration-tests.yml)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

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

@@ -347,6 +347,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
     end
 
     def perform_request_to_url(url, method, path, params={}, body=nil)
+      params ||= {}
       params[:headers] = DEFAULT_EAV_HEADER.merge(params[:headers] || {}) if serverless?
       @adapter.perform_request(url, method, path, params, body)
     end

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

@@ -433,7 +433,7 @@ module LogStash; module Outputs; class ElasticSearch;
     def template_put(template_endpoint, name, template)
       path = "#{template_endpoint}/#{name}"
       logger.info("Installing Elasticsearch template", name: name)
-      @pool.put(path, nil, LogStash::Json.dump(template))
+      @pool.put(path, {}, LogStash::Json.dump(template))
     rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError => e
       raise e unless e.response_code == 404
     end
@@ -447,7 +447,7 @@ module LogStash; module Outputs; class ElasticSearch;
 
     # Create a new rollover alias
     def rollover_alias_put(alias_name, alias_definition)
-      @pool.put(CGI::escape(alias_name), nil, LogStash::Json.dump(alias_definition))
+      @pool.put(CGI::escape(alias_name), {}, LogStash::Json.dump(alias_definition))
       logger.info("Created rollover alias", name: alias_name)
       # If the rollover alias already exists, ignore the error that comes back from Elasticsearch
     rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError => e
@@ -473,7 +473,7 @@ module LogStash; module Outputs; class ElasticSearch;
     def ilm_policy_put(name, policy)
       path = "_ilm/policy/#{name}"
       logger.info("Installing ILM policy #{policy}", name: name)
-      @pool.put(path, nil, LogStash::Json.dump(policy))
+      @pool.put(path, {}, LogStash::Json.dump(policy))
     end
 
 

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

@@ -28,6 +28,7 @@ module LogStash; module Outputs; class ElasticSearch
       end
 
       add_ilm_settings_to_template(plugin, template) if plugin.ilm_in_use?
+      strip_serverless_incompatible_settings(template) if plugin.serverless?
       plugin.logger.debug("Attempting to install template", template: template)
       install(plugin.client, template_endpoint(plugin), template_name(plugin), template, plugin.template_overwrite)
     end
@@ -129,5 +130,19 @@ module LogStash; module Outputs; class ElasticSearch
       end
     end
 
+    SERVERLESS_INCOMPATIBLE_SETTINGS = %w[
+      number_of_shards
+      index.number_of_shards
+      number_of_replicas
+      index.number_of_replicas
+    ].freeze
+
+    def self.strip_serverless_incompatible_settings(template)
+      settings = template.dig('template', 'settings') || template['settings']
+      return unless settings
+
+      SERVERLESS_INCOMPATIBLE_SETTINGS.each { |s| settings.delete(s) }
+    end
+
   end
 end end end

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '11.22.15'
+  s.version         = ::File.read('version').split("\n").first
   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"
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.platform = RUBY_PLATFORM
 
   # 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/spec/unit/outputs/elasticsearch/template_manager_spec.rb

@@ -186,4 +186,75 @@ describe LogStash::Outputs::ElasticSearch::TemplateManager do
 
     end
   end
+
+  describe ".strip_serverless_incompatible_settings" do
+    context "with composable template (template.settings)" do
+      let(:template) do
+        {
+          "template" => {
+            "settings" => {
+              "index.refresh_interval" => "5s",
+              "number_of_shards" => 1,
+              "number_of_replicas" => 0
+            }
+          }
+        }
+      end
+
+      it "removes number_of_shards and number_of_replicas" do
+        described_class.strip_serverless_incompatible_settings(template)
+        expect(template["template"]["settings"]).not_to have_key("number_of_shards")
+        expect(template["template"]["settings"]).not_to have_key("number_of_replicas")
+      end
+
+      it "preserves compatible settings" do
+        described_class.strip_serverless_incompatible_settings(template)
+        expect(template["template"]["settings"]["index.refresh_interval"]).to eq("5s")
+      end
+    end
+
+    context "with index-prefixed setting keys" do
+      let(:template) do
+        {
+          "template" => {
+            "settings" => {
+              "index.number_of_shards" => 1,
+              "index.number_of_replicas" => 0
+            }
+          }
+        }
+      end
+
+      it "removes index-prefixed variants" do
+        described_class.strip_serverless_incompatible_settings(template)
+        expect(template["template"]["settings"]).not_to have_key("index.number_of_shards")
+        expect(template["template"]["settings"]).not_to have_key("index.number_of_replicas")
+      end
+    end
+
+    context "with legacy template (top-level settings)" do
+      let(:template) do
+        {
+          "settings" => {
+            "index.refresh_interval" => "5s",
+            "number_of_shards" => 1
+          }
+        }
+      end
+
+      it "removes incompatible settings from top-level settings" do
+        described_class.strip_serverless_incompatible_settings(template)
+        expect(template["settings"]).not_to have_key("number_of_shards")
+        expect(template["settings"]["index.refresh_interval"]).to eq("5s")
+      end
+    end
+
+    context "with no settings" do
+      let(:template) { { "mappings" => {} } }
+
+      it "does not raise" do
+        expect { described_class.strip_serverless_incompatible_settings(template) }.not_to raise_error
+      end
+    end
+  end
 end

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -908,6 +908,9 @@ describe LogStash::Outputs::ElasticSearch do
 
     before(:each) do
       allow(elasticsearch_output_instance.client).to receive(:logger).and_return(logger_stub)
+      # Stub the output plugin's own @logger to prevent submit()/retrying_submit()
+      # from logging the full 15MB action payload on each retry, which floods stdout.
+      elasticsearch_output_instance.instance_variable_set(:@logger, logger_stub)
 
       allow(elasticsearch_output_instance.client).to receive(:bulk).and_call_original
 

data/version

@@ -0,0 +1 @@
+11.22.16

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 11.22.15
+  version: 11.22.16
 platform: java
 authors:
 - Elastic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-17 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: manticore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,7 +19,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: manticore
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,6 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-  name: stud
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,6 +50,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +59,6 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,12 +70,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
+  name: logstash-mixin-ecs_compatibility_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: logstash-mixin-ecs_compatibility_support
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,12 +84,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-mixin-deprecation_logger_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: logstash-mixin-deprecation_logger_support
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,12 +98,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-mixin-ca_trusted_fingerprint_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: logstash-mixin-ca_trusted_fingerprint_support
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,12 +112,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-mixin-normalize_config_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: logstash-mixin-normalize_config_support
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,12 +126,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,12 +140,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,12 +154,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: flores
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: flores
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,12 +168,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: cabin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-  name: cabin
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -183,12 +182,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: webrick
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,12 +196,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: webmock
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -211,12 +210,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-collection_matchers
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -225,12 +224,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: elasticsearch
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -339,13 +338,13 @@ files:
 - spec/unit/outputs/elasticsearch_ssl_spec.rb
 - spec/unit/outputs/error_whitelist_spec.rb
 - spec/unit/outputs/license_check_spec.rb
+- version
 homepage: https://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - apache-2.0
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -360,8 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Stores logs in Elasticsearch
 test_files: