fluent-plugin-elasticsearch 5.4.4 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5808f1d08b2a774e67ea22cbf9b678100a1a630c22f6d27ed4c2c656b396f32c
-  data.tar.gz: 836d9697ba68a2b86875429abd31fd09b8d4533d26b2dab4ede5ebdf64a9aad7
+  metadata.gz: b54470881e62c1a0c6fccc56867faf07ecbe210a0926a8073fc646fcd2ffc9e1
+  data.tar.gz: f973db55d17915664f6cb59676738c62f7408c3d94734cdb54b76025d62d82c8
 SHA512:
-  metadata.gz: 3c349e163f308a421d5bc7f74f170def2a1b3845650680b93479a01fcdcd32b2a89dfcb49903ca6c3eaea041beb9dcead4ce5735189f83aa95f9151c2ce3433a
-  data.tar.gz: 0cb7d133409a0289a00fd3e09e9447ac92a3ab72d74cefe92e191477e3bbba0673a322448d8828bb0adc37fcb6f7c523469ec9a95273a5a86fade6fb0dc9cdc8
+  metadata.gz: 45a60caf34b6e02e5e2a46fd02535a3fa1648d1feb712c1d20c1a88f041c29a39fe688afba1c88511a572075db7e98c767ad81b4197b6bc56a1e1e27d9149764
+  data.tar.gz: 2e0d0dab94d7c3112b637f185c9df0bf16c2fb1805d9186de2fecf6d25e66eea269482431b2db20b62e66f16ebcbd66dd576d6e1e957c12c29d68728b7132806

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 6.0.0
+-  Adjust Content-Type and Accept headers for sending logs into ES9 (#1064)
+
 ### 5.4.4
 - docs: Clarify README docs for template_name and templates (#1043)
 - `out_elasticsearch_data_stream`: Avoid long worrying log line at info level (#1044)

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '5.4.4'
+  s.version       = '6.0.0'
   s.authors       = ['diogo', 'pitr', 'Hiroshi Hatake']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com', 'cosmo0920.wp@gmail.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -73,6 +73,7 @@ module Fluent::Plugin
     DEFAULT_RELOAD_AFTER = -1
     DEFAULT_TARGET_BULK_BYTES = -1
     DEFAULT_POLICY_ID = "logstash-policy"
+    ES9_CONTENT_TYPE = "application/vnd.elasticsearch+x-ndjson; compatible-with=9"
 
     config_param :host, :string,  :default => 'localhost'
     config_param :port, :integer, :default => 9200
@@ -350,10 +351,22 @@ EOC
           log.warn "Detected ES 7.x: `_doc` will be used as the document `_type`."
           @type_name = '_doc'.freeze
         end
-        if @last_seen_major_version >= 8 && @type_name != DEFAULT_TYPE_NAME_ES_7x
-          log.debug "Detected ES 8.x or above: This parameter has no effect."
+        if @last_seen_major_version == 8 && @type_name != DEFAULT_TYPE_NAME_ES_7x
+          log.debug "Detected ES 8.x: This parameter has no effect."
           @type_name = nil
         end
+        if @last_seen_major_version >= 9
+          if @type_name != DEFAULT_TYPE_NAME_ES_7x
+            log.debug "Detected ES 9.x or above: This parameter has no effect."
+            @type_name = nil
+          end
+          @accept_type = nil
+          if @content_type != ES9_CONTENT_TYPE
+            log.trace "Detected ES 9.x or above: Content-Type will be adjusted."
+            @content_type = ES9_CONTENT_TYPE
+            @accept_type = ES9_CONTENT_TYPE
+          end
+        end
       end
 
       if @validate_client_version && !dry_run?
@@ -614,6 +627,8 @@ EOC
                     .merge(@custom_headers)
                     .merge(@api_key_header)
                     .merge(gzip_headers)
+        headers.merge!('Accept' => @accept_type) if @accept_type
+
         ssl_options = { verify: @ssl_verify, ca_file: @ca_file}.merge(@ssl_version_options)
 
         transport = TRANSPORT_CLASS::Transport::HTTP::Faraday.new(connection_options.merge(

data/test/plugin/test_out_elasticsearch.rb

@@ -90,7 +90,13 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   end
 
   def stub_elastic(url="http://localhost:9200/_bulk")
-    stub_request(:post, url).with do |req|
+    headers = if elasticsearch_miscellaneous_content_type?
+                { "Content-Type" => "application/vnd.elasticsearch+x-ndjson; compatible-with=9" }
+              else
+                {}
+              end
+
+    stub_request(:post, url).with({headers: headers}) do |req|
       @index_cmds = req.body.split("\n").map {|r| JSON.parse(r) }
     end.to_return({:status => 200, :body => "", :headers => { 'Content-Type' => 'json', 'x-elastic-product' => 'Elasticsearch' } })
   end
@@ -4016,6 +4022,7 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
   data('Elasticsearch 6' => [6, Fluent::Plugin::ElasticsearchOutput::DEFAULT_TYPE_NAME],
        'Elasticsearch 7' => [7, Fluent::Plugin::ElasticsearchOutput::DEFAULT_TYPE_NAME_ES_7x],
        'Elasticsearch 8' => [8, nil],
+       'Elasticsearch 9' => [9, nil],
       )
   def test_writes_to_default_type(data)
     version, index_type = data

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 5.4.4
+  version: 6.0.0
 platform: ruby
 authors:
 - diogo
 - pitr
 - Hiroshi Hatake
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -235,6 +236,7 @@ licenses:
 - Apache-2.0
 metadata:
   changelog_uri: https://github.com/uken/fluent-plugin-elasticsearch/blob/master/History.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -249,7 +251,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Elasticsearch output plugin for Fluent event collector
 test_files: