logstash-output-elasticsearch 11.22.9-java → 11.22.11-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1276b8bd29a1332d9dadb06c92e9c62b70e23293a7316d62c8e124b492f7b6b8
-  data.tar.gz: 7c6163b80bcffa621a2d19c91133b9d66733781ae5075f403a478ba0a7d122ed
+  metadata.gz: 73430889fa821b0bd24a49c0278bd9be2f2107459025f2f31a3eb8a3d70f8261
+  data.tar.gz: 7848e77db848b7bac6faff43460b5206163380e6a4184510744f12f058ff6aa1
 SHA512:
-  metadata.gz: '092df2c01ae5c4f9e364bb56469ba3acbf705391bd4c04e65891deae3b9c377fd3be37c6dd6b12b0e9de2f4a3125e4d09df0de6d8dd03bc7ada19a85b1eaca4e'
-  data.tar.gz: ca93c24e48e71360d5e9722ec35025241c40eac255e83c60ce65b5d607517752609bb304e6d091f02cd8df06d9607afcdbe43c1d2dfb6f5990972fe40c0e1bd1
+  metadata.gz: 1541f0f7be5499378824a52628ade21c70a3e8370c94d12824e363deb654a47a600ffbee9d68bb77eb3cc087ae4fd07ff9b7e7b4494ccbd41c458eeccf44cb34
+  data.tar.gz: 2d4ef863c9c5c6051b62005488bb7f7872302d56430cc12be78e4df4e5e3db4a8a912e9ba7d7188defb4d0ea80d31db262a4ede46a43554d9b69f779ea7d4284

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 11.22.11
+ - Remove irrelevant log warning about elastic stack version [#1202](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1202)
+
+## 11.22.10
+ - Add `x-elastic-product-origin` header to Elasticsearch requests [#1195](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1195)
+
 ## 11.22.9
  - Vendor ECS template for Elasticsearch 9.x in built gem [#1188](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1188)
 

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

@@ -2,7 +2,7 @@ require 'manticore'
 require 'cgi'
 
 module LogStash; module Outputs; class ElasticSearch; class HttpClient;
-  DEFAULT_HEADERS = { "Content-Type" => "application/json" }
+  DEFAULT_HEADERS = { "Content-Type" => "application/json", 'x-elastic-product-origin' => 'logstash-output-elasticsearch' }
   
   class ManticoreAdapter
     attr_reader :manticore, :logger

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

@@ -515,20 +515,13 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       major = major_version(version)
       if @maximum_seen_major_version.nil?
         @logger.info("Elasticsearch version determined (#{version})", es_version: major)
-        set_maximum_seen_major_version(major)
+        @maximum_seen_major_version = major
       elsif major > @maximum_seen_major_version
         warn_on_higher_major_version(major, url)
         @maximum_seen_major_version = major
       end
     end
 
-    def set_maximum_seen_major_version(major)
-      if major >= 6
-        @logger.warn("Detected a 6.x and above cluster: the `type` event field won't be used to determine the document _type", es_version: major)
-      end
-      @maximum_seen_major_version = major
-    end
-
     def warn_on_higher_major_version(major, url)
       @logger.warn("Detected a node with a higher major version than previously observed, " +
                    "this could be the result of an Elasticsearch cluster upgrade",

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '11.22.9'
+  s.version         = '11.22.11'
   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/integration/outputs/compressed_indexing_spec.rb

@@ -32,6 +32,13 @@ end
     let(:http_client) do
       Manticore::Client.new(http_client_options)
     end
+    let(:expected_headers) {
+      {
+        "Content-Encoding" => "gzip",
+        "Content-Type" => "application/json",
+        'x-elastic-product-origin' => 'logstash-output-elasticsearch'
+      }
+    }
 
     before do
       subject.register
@@ -64,7 +71,7 @@ end
 
     it "sets the correct content-encoding header and body is compressed" do
       expect(subject.client.pool.adapter.client).to receive(:send).
-        with(anything, anything, {:headers=>{"Content-Encoding"=>"gzip", "Content-Type"=>"application/json"}, :body => a_valid_gzip_encoded_string}).
+        with(anything, anything, {:headers=> expected_headers, :body => a_valid_gzip_encoded_string}).
         and_call_original
       subject.multi_receive(events)
     end

data/spec/integration/outputs/index_spec.rb

@@ -214,10 +214,13 @@ describe "indexing" do
     end
 
     it "sets the correct content-type header" do
-      expected_manticore_opts = {:headers => {"Content-Type" => "application/json"}, :body => anything}
+      expected_manticore_opts = {
+        :headers => {"Content-Type" => "application/json", 'x-elastic-product-origin' => 'logstash-output-elasticsearch'},
+        :body => anything
+      }
       if secure
         expected_manticore_opts = {
-          :headers => {"Content-Type" => "application/json"},
+          :headers => {"Content-Type" => "application/json", 'x-elastic-product-origin' => 'logstash-output-elasticsearch'},
           :body => anything,
           :auth => {
             :user => user,

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

@@ -34,7 +34,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
       
       expect(subject.manticore).to receive(:get).
         with(expected_uri.to_s, {
-          :headers => {"Content-Type" => "application/json"},
+          :headers => LogStash::Outputs::ElasticSearch::HttpClient::DEFAULT_HEADERS,
           :auth => {
             :user => user,
             :password => password,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 11.22.9
+  version: 11.22.11
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement