logstash-output-elasticsearch 9.2.3-java → 9.2.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e4f54b01a626097bb553a3955afb9718ba7646c14f08ad0fe0eb89c15162b36
-  data.tar.gz: 957ae579af4d96853c4be2da24802cf8da56d6277868ed2353696a5aa607b0bf
+  metadata.gz: 42465226c4184be1d0a210a70c4baf76219818de876bb05e7223c6e33575cbd3
+  data.tar.gz: 4f547ee1a60601b1412fb9adfbb53de1b07bfbc87215e871089c09e7e593dec1
 SHA512:
-  metadata.gz: 366093f142db6dcf2db65ca6ca8cf342b67ac2ac61b4a1ba9bd7820701844fb2b950096438354136f7f0d9e67a70e5900b0231864d7e1e804b1705cb155f97b1
-  data.tar.gz: 1942f02dffe708e9f8bbd2b6ec3c4c134577625ced71012415cb8fcf87e6ffdad7fc5ae53fc0690def17fa2e574719c42ca590a44fdc91ad34b1caf2a017fdc8
+  metadata.gz: 2bf8b3f9ffe85bbd63e4456131271f06cad92acc95033cb79c40900b8199ee8795d8267aeb488085d65d0b07de9a9361710906573f76f818ed9f271acea90d06
+  data.tar.gz: ddac41655af9d2af7b1d2bf0dff94bcbb497daca068efc7423c3af1ca8cb14b235e8afedf81bc0864a968d1f685039b458c78e1af1b91114135e66e34e8312bf

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 9.2.4
+  - Fixed support for Elasticsearch 7.x [#812](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/812)
+
 ## 9.2.3
   - Tweaked logging statements to reduce verbosity
 

data/docs/index.asciidoc

@@ -96,7 +96,7 @@ happens, the problem is logged as a warning, and the event is dropped. See
 ==== Batch Sizes
 
 This plugin attempts to send batches of events as a single request. However, if
-a request exceeds 20MB we will break it up until multiple batch requests. If a single document exceeds 20MB it will be sent as a single request.
+a request exceeds 20MB we will break it up into multiple batch requests. If a single document exceeds 20MB it will be sent as a single request.
 
 ==== DNS Caching
 

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

@@ -67,7 +67,7 @@ module LogStash; module Outputs; class ElasticSearch;
         :_id => @document_id ? event.sprintf(@document_id) : nil,
         :_index => event.sprintf(@index),
         :_type => get_event_type(event),
-        :_routing => @routing ? event.sprintf(@routing) : nil
+        routing_field_name => @routing ? event.sprintf(@routing) : nil
       }
 
       if @pipeline
@@ -79,7 +79,7 @@ module LogStash; module Outputs; class ElasticSearch;
           join_value = event.get(@join_field)
           parent_value = event.sprintf(@parent)
           event.set(@join_field, { "name" => join_value, "parent" => parent_value })
-          params[:_routing] = event.sprintf(@parent)
+          params[routing_field_name] = event.sprintf(@parent)
         else
           params[:parent] = event.sprintf(@parent)
         end
@@ -88,7 +88,7 @@ module LogStash; module Outputs; class ElasticSearch;
       if action == 'update'
         params[:_upsert] = LogStash::Json.load(event.sprintf(@upsert)) if @upsert != ""
         params[:_script] = event.sprintf(@script) if @script != ""
-        params[:_retry_on_conflict] = @retry_on_conflict
+        params[retry_on_conflict_action_name] = @retry_on_conflict
       end
 
       if @version
@@ -114,6 +114,15 @@ module LogStash; module Outputs; class ElasticSearch;
       client.maximum_seen_major_version
     end
 
+
+    def routing_field_name
+      maximum_seen_major_version >= 6 ? :routing : :_routing
+    end
+
+    def retry_on_conflict_action_name
+      maximum_seen_major_version >= 7 ? :retry_on_conflict : :_retry_on_conflict
+    end
+
     def install_template
       TemplateManager.install_template(self)
       @template_installed.make_true

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

@@ -170,7 +170,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
         return nil
       else
         case major_version(url_meta[:version])
-        when 5, 6
+        when 5, 6, 7
           sniff_5x_and_above(nodes)
         when 2, 1
           sniff_2x_1x(nodes)

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '9.2.3'
+  s.version         = '9.2.4'
   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/es_spec_helper.rb

@@ -11,6 +11,31 @@ module ESHelper
     Elasticsearch::Client.new(:hosts => [get_host_port])
   end
 
+  def doc_type
+    if ESHelper.es_version_satisfies?(">=7")
+      "_doc"
+    else
+      "doc"
+    end
+  end
+
+  def mapping_name
+    if ESHelper.es_version_satisfies?(">=7")
+      "_doc"
+    else
+      "_default_"
+    end
+
+  end
+
+  def routing_field_name
+    if ESHelper.es_version_satisfies?(">=6")
+      :routing
+    else
+      :_routing
+    end
+  end
+
   def self.es_version
     RSpec.configuration.filter[:es_version] || ENV['ES_VERSION']
   end

data/spec/integration/outputs/compressed_indexing_spec.rb

@@ -50,7 +50,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         result = LogStash::Json.load(response.body)
         result["hits"]["hits"].each do |doc|
           if ESHelper.es_version_satisfies?(">= 6")
-            expect(doc["_type"]).to eq("doc")
+            expect(doc["_type"]).to eq(doc_type)
           else
             expect(doc["_type"]).to eq(type)
           end

data/spec/integration/outputs/delete_spec.rb

@@ -40,12 +40,12 @@ if ESHelper.es_version_satisfies?(">= 2")
       it "should ignore non-monotonic external version updates" do
         id = "ev2"
         subject.multi_receive([LogStash::Event.new("my_id" => id, "my_action" => "index", "message" => "foo", "my_version" => 99)])
-        r = es.get(:index => 'logstash-delete', :type => 'doc', :id => id, :refresh => true)
+        r = es.get(:index => 'logstash-delete', :type => doc_type, :id => id, :refresh => true)
         expect(r['_version']).to eq(99)
         expect(r['_source']['message']).to eq('foo')
 
         subject.multi_receive([LogStash::Event.new("my_id" => id, "my_action" => "delete", "message" => "foo", "my_version" => 98)])
-        r2 = es.get(:index => 'logstash-delete', :type => 'doc', :id => id, :refresh => true)
+        r2 = es.get(:index => 'logstash-delete', :type => doc_type, :id => id, :refresh => true)
         expect(r2['_version']).to eq(99)
         expect(r2['_source']['message']).to eq('foo')
       end
@@ -53,12 +53,12 @@ if ESHelper.es_version_satisfies?(">= 2")
       it "should commit monotonic external version updates" do
         id = "ev3"
         subject.multi_receive([LogStash::Event.new("my_id" => id, "my_action" => "index", "message" => "foo", "my_version" => 99)])
-        r = es.get(:index => 'logstash-delete', :type => 'doc', :id => id, :refresh => true)
+        r = es.get(:index => 'logstash-delete', :type => doc_type, :id => id, :refresh => true)
         expect(r['_version']).to eq(99)
         expect(r['_source']['message']).to eq('foo')
 
         subject.multi_receive([LogStash::Event.new("my_id" => id, "my_action" => "delete", "message" => "foo", "my_version" => 100)])
-        expect { es.get(:index => 'logstash-delete', :type => 'doc', :id => id, :refresh => true) }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
+        expect { es.get(:index => 'logstash-delete', :type => doc_type, :id => id, :refresh => true) }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
       end
     end
   end

data/spec/integration/outputs/groovy_update_spec.rb

@@ -25,7 +25,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
       @es.indices.delete(:index => "*") rescue nil
       @es.index(
         :index => 'logstash-update',
-        :type => 'doc',
+        :type => doc_type,
         :id => "123",
         :body => { :message => 'Test', :counter => 1 }
       )
@@ -37,7 +37,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject = get_es_output({ 'document_id' => "123", 'script' => 'scripted_update', 'script_type' => 'file' })
         subject.register
         subject.multi_receive([LogStash::Event.new("count" => 2)])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["counter"]).to eq(3)
       end
 
@@ -45,7 +45,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject = get_es_output({ 'document_id' => "123", 'script' => 'scripted_update_nested', 'script_type' => 'file' })
         subject.register
         subject.multi_receive([LogStash::Event.new("data" => { "count" => 3 })])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["counter"]).to eq(4)
       end
 
@@ -58,7 +58,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         })
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["counter"]).to eq(4)
       end
 
@@ -72,7 +72,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         })
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["counter"]).to eq(4)
       end
 
@@ -86,7 +86,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         })
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["counter"]).to eq(3)
       end
 
@@ -100,7 +100,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         })
         subject.register
         subject.multi_receive([LogStash::Event.new("count" => 4 )])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["counter"]).to eq(5)
       end
     end
@@ -110,7 +110,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject = get_es_output({ 'document_id' => "456", 'upsert' => '{"message": "upsert message"}' })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["message"]).to eq('upsert message')
       end
 
@@ -118,7 +118,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject = get_es_output({ 'document_id' => "456", 'doc_as_upsert' => true })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["message"]).to eq('sample message here')
       end
 
@@ -133,7 +133,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject = get_es_output({ 'document_id' => "456", 'script' => 'scripted_update', 'upsert' => '{"message": "upsert message"}', 'script_type' => 'file' })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["message"]).to eq('upsert message')
       end
 
@@ -142,7 +142,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 1)])
         @es.indices.refresh
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["counter"]).to eq(1)
       end
     end

data/spec/integration/outputs/index_spec.rb

@@ -79,7 +79,7 @@ describe "indexing" do
       result = LogStash::Json.load(response.body)
       result["hits"]["hits"].each do |doc|
         if ESHelper.es_version_satisfies?(">= 6")
-          expect(doc["_type"]).to eq("doc")
+          expect(doc["_type"]).to eq(doc_type)
         else
           expect(doc["_type"]).to eq(type)
         end

data/spec/integration/outputs/index_version_spec.rb

@@ -38,11 +38,11 @@ if ESHelper.es_version_satisfies?(">= 2")
 
         it "should default to ES version" do
           subject.multi_receive([LogStash::Event.new("my_id" => "123", "message" => "foo")])
-          r = es.get(:index => 'logstash-index', :type => 'doc', :id => "123", :refresh => true)
+          r = es.get(:index => 'logstash-index', :type => doc_type, :id => "123", :refresh => true)
           expect(r["_version"]).to eq(1)
           expect(r["_source"]["message"]).to eq('foo')
           subject.multi_receive([LogStash::Event.new("my_id" => "123", "message" => "foobar")])
-          r2 = es.get(:index => 'logstash-index', :type => 'doc', :id => "123", :refresh => true)
+          r2 = es.get(:index => 'logstash-index', :type => doc_type, :id => "123", :refresh => true)
           expect(r2["_version"]).to eq(2)
           expect(r2["_source"]["message"]).to eq('foobar')
         end  
@@ -66,7 +66,7 @@ if ESHelper.es_version_satisfies?(">= 2")
         it "should respect the external version" do
           id = "ev1"
           subject.multi_receive([LogStash::Event.new("my_id" => id, "my_version" => "99", "message" => "foo")])
-          r = es.get(:index => 'logstash-index', :type => 'doc', :id => id, :refresh => true)
+          r = es.get(:index => 'logstash-index', :type => doc_type, :id => id, :refresh => true)
           expect(r["_version"]).to eq(99)
           expect(r["_source"]["message"]).to eq('foo')
         end
@@ -74,12 +74,12 @@ if ESHelper.es_version_satisfies?(">= 2")
         it "should ignore non-monotonic external version updates" do
           id = "ev2"
           subject.multi_receive([LogStash::Event.new("my_id" => id, "my_version" => "99", "message" => "foo")])
-          r = es.get(:index => 'logstash-index', :type => 'doc', :id => id, :refresh => true)
+          r = es.get(:index => 'logstash-index', :type => doc_type, :id => id, :refresh => true)
           expect(r["_version"]).to eq(99)
           expect(r["_source"]["message"]).to eq('foo')
 
           subject.multi_receive([LogStash::Event.new("my_id" => id, "my_version" => "98", "message" => "foo")])
-          r2 = es.get(:index => 'logstash-index', :type => 'doc', :id => id, :refresh => true)
+          r2 = es.get(:index => 'logstash-index', :type => doc_type, :id => id, :refresh => true)
           expect(r2["_version"]).to eq(99)
           expect(r2["_source"]["message"]).to eq('foo')
         end
@@ -87,12 +87,12 @@ if ESHelper.es_version_satisfies?(">= 2")
         it "should commit monotonic external version updates" do
           id = "ev3"
           subject.multi_receive([LogStash::Event.new("my_id" => id, "my_version" => "99", "message" => "foo")])
-          r = es.get(:index => 'logstash-index', :type => 'doc', :id => id, :refresh => true)
+          r = es.get(:index => 'logstash-index', :type => doc_type, :id => id, :refresh => true)
           expect(r["_version"]).to eq(99)
           expect(r["_source"]["message"]).to eq('foo')
 
           subject.multi_receive([LogStash::Event.new("my_id" => id, "my_version" => "100", "message" => "foo")])
-          r2 = es.get(:index => 'logstash-index', :type => 'doc', :id => id, :refresh => true)
+          r2 = es.get(:index => 'logstash-index', :type => doc_type, :id => id, :refresh => true)
           expect(r2["_version"]).to eq(100)
           expect(r2["_source"]["message"]).to eq('foo')
         end

data/spec/integration/outputs/painless_update_spec.rb

@@ -27,7 +27,7 @@ if ESHelper.es_version_satisfies?(">= 5")
       @es.indices.delete(:index => "*") rescue nil
       @es.index(
         :index => 'logstash-update',
-        :type => 'doc',
+        :type => doc_type,
         :id => "123",
         :body => { :message => 'Test', :counter => 1 }
       )
@@ -41,7 +41,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject = get_es_output({ 'document_id' => "123", 'script' => 'scripted_update', 'script_type' => 'file' })
             subject.register
             subject.multi_receive([LogStash::Event.new("count" => 2)])
-            r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+            r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
             expect(r["_source"]["counter"]).to eq(3)
           end
 
@@ -49,7 +49,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject = get_es_output({ 'document_id' => "123", 'script' => 'scripted_update_nested', 'script_type' => 'file' })
             subject.register
             subject.multi_receive([LogStash::Event.new("data" => { "count" => 3 })])
-            r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+            r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
             expect(r["_source"]["counter"]).to eq(4)
           end
         end
@@ -63,7 +63,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         })
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["counter"]).to eq(4)
       end
 
@@ -76,7 +76,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         })
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["counter"]).to eq(4)
       end
 
@@ -89,7 +89,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         })
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["counter"]).to eq(3)
       end
 
@@ -114,7 +114,7 @@ if ESHelper.es_version_satisfies?(">= 5")
           subject = get_es_output(plugin_parameters)
           subject.register
           subject.multi_receive([LogStash::Event.new("count" => 4 )])
-          r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+          r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
           expect(r["_source"]["counter"]).to eq(5)
         end
       end
@@ -125,7 +125,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         subject = get_es_output({ 'document_id' => "456", 'upsert' => '{"message": "upsert message"}' })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["message"]).to eq('upsert message')
       end
 
@@ -133,7 +133,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         subject = get_es_output({ 'document_id' => "456", 'doc_as_upsert' => true })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["message"]).to eq('sample message here')
       end
 
@@ -150,7 +150,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject = get_es_output({ 'document_id' => "456", 'script' => 'scripted_update', 'upsert' => '{"message": "upsert message"}', 'script_type' => 'file' })
             subject.register
             subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-            r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+            r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
             expect(r["_source"]["message"]).to eq('upsert message')
           end
 
@@ -159,7 +159,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject.register
             subject.multi_receive([LogStash::Event.new("counter" => 1)])
             @es.indices.refresh
-            r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+            r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
             expect(r["_source"]["counter"]).to eq(1)
           end
         end
@@ -169,8 +169,9 @@ if ESHelper.es_version_satisfies?(">= 5")
         it "should create new documents with upsert content" do
           subject = get_es_output({ 'document_id' => "456", 'script' => 'ctx._source.counter = params.event.counter', 'upsert' => '{"message": "upsert message"}', 'script_type' => 'inline' })
           subject.register
+
           subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-          r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+          r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
           expect(r["_source"]["message"]).to eq('upsert message')
         end
 
@@ -179,7 +180,7 @@ if ESHelper.es_version_satisfies?(">= 5")
           subject.register
           subject.multi_receive([LogStash::Event.new("counter" => 1)])
           @es.indices.refresh
-          r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+          r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
           expect(r["_source"]["counter"]).to eq(1)
         end
       end

data/spec/integration/outputs/retry_spec.rb

@@ -4,9 +4,9 @@ require_relative "../../../spec/es_spec_helper"
 describe "failures in bulk class expected behavior", :integration => true do
   let(:template) { '{"template" : "not important, will be updated by :index"}' }
   let(:event1) { LogStash::Event.new("somevalue" => 100, "@timestamp" => "2014-11-17T20:37:17.223Z", "@metadata" => {"retry_count" => 0}) }
-  let(:action1) { ["index", {:_id=>nil, :_routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event1] }
+  let(:action1) { ["index", {:_id=>nil, routing_field_name =>nil, :_index=>"logstash-2014.11.17", :_type=> doc_type }, event1] }
   let(:event2) { LogStash::Event.new("geoip" => { "location" => [ 0.0, 0.0] }, "@timestamp" => "2014-11-17T20:37:17.223Z", "@metadata" => {"retry_count" => 0}) }
-  let(:action2) { ["index", {:_id=>nil, :_routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event2] }
+  let(:action2) { ["index", {:_id=>nil, routing_field_name =>nil, :_index=>"logstash-2014.11.17", :_type=> doc_type }, event2] }
   let(:invalid_event) { LogStash::Event.new("geoip" => { "location" => "notlatlon" }, "@timestamp" => "2014-11-17T20:37:17.223Z") }
 
   def mock_actions_with_response(*resp)

data/spec/integration/outputs/templates_5x_spec.rb

@@ -82,7 +82,7 @@ if ESHelper.es_version_satisfies?(">= 5")
     end
 
     it "make [geoip][location] a geo_point" do
-      expect(@es.indices.get_template(name: "logstash")["logstash"]["mappings"]["_default_"]["properties"]["geoip"]["properties"]["location"]["type"]).to eq("geo_point")
+      expect(@es.indices.get_template(name: "logstash")["logstash"]["mappings"][mapping_name]["properties"]["geoip"]["properties"]["location"]["type"]).to eq("geo_point")
     end
 
     it "aggregate .keyword results correctly " do

data/spec/integration/outputs/update_spec.rb

@@ -24,7 +24,7 @@ if ESHelper.es_version_satisfies?(">= 2")
       @es.indices.delete(:index => "*") rescue nil
       @es.index(
         :index => 'logstash-update',
-        :type => 'doc',
+        :type => doc_type,
         :id => "123",
         :body => { :message => 'Test', :counter => 1 }
       )
@@ -41,14 +41,14 @@ if ESHelper.es_version_satisfies?(">= 2")
         subject = get_es_output({ 'document_id' => "456" } )
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        expect {@es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)}.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
+        expect {@es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)}.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
       end
 
       it "should update existing document" do
         subject = get_es_output({ 'document_id' => "123" })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "updated message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["message"]).to eq('updated message here')
       end
 
@@ -58,7 +58,7 @@ if ESHelper.es_version_satisfies?(">= 2")
         subject = get_es_output({ 'document_id' => "123" })
         subject.register
         subject.multi_receive([LogStash::Event.new("data" => "updated message here", "message" => "foo")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "123", :refresh => true)
         expect(r["_source"]["data"]).to eq('updated message here')
         expect(r["_source"]["message"]).to eq('foo')
       end
@@ -95,7 +95,7 @@ if ESHelper.es_version_satisfies?(">= 2")
         subject = get_es_output({ 'document_id' => "456", 'upsert' => '{"message": "upsert message"}' })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["message"]).to eq('upsert message')
       end
 
@@ -103,7 +103,7 @@ if ESHelper.es_version_satisfies?(">= 2")
         subject = get_es_output({ 'document_id' => "456", 'doc_as_upsert' => true })
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-        r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
+        r = @es.get(:index => 'logstash-update', :type => doc_type, :id => "456", :refresh => true)
         expect(r["_source"]["message"]).to eq('sample message here')
       end
 

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -362,7 +362,7 @@ describe LogStash::Outputs::ElasticSearch do
       it "should not set the retry_on_conflict parameter when creating an event_action_tuple" do
         allow(subject.client).to receive(:maximum_seen_major_version).and_return(maximum_seen_major_version)
         action, params, event_data = subject.event_action_tuple(event)
-        expect(params).not_to include({:_retry_on_conflict => num_retries})
+        expect(params).not_to include({subject.retry_on_conflict_action_name => num_retries})
       end
     end
 
@@ -371,7 +371,7 @@ describe LogStash::Outputs::ElasticSearch do
 
       it "should set the retry_on_conflict parameter when creating an event_action_tuple" do
         action, params, event_data = subject.event_action_tuple(event)
-        expect(params).to include({:_retry_on_conflict => num_retries})
+        expect(params).to include({subject.retry_on_conflict_action_name => num_retries})
       end
     end
 
@@ -380,7 +380,7 @@ describe LogStash::Outputs::ElasticSearch do
 
       it "should set the retry_on_conflict parameter when creating an event_action_tuple" do
         action, params, event_data = subject.event_action_tuple(event)
-        expect(params).to include({:_retry_on_conflict => num_retries})
+        expect(params).to include({subject.retry_on_conflict_action_name => num_retries})
         expect(action).to eq("update")
       end
     end

data/spec/unit/outputs/error_whitelist_spec.rb

@@ -4,7 +4,7 @@ require_relative "../../../spec/es_spec_helper"
 describe "whitelisting error types in expected behavior" do
   let(:template) { '{"template" : "not important, will be updated by :index"}' }
   let(:event1) { LogStash::Event.new("somevalue" => 100, "@timestamp" => "2014-11-17T20:37:17.223Z") }
-  let(:action1) { ["index", {:_id=>1, :_routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event1] }
+  let(:action1) { ["index", {:_id=>1, :routing=>nil, :_index=>"logstash-2014.11.17", :_type=> doc_type }, event1] }
   let(:settings) { {"manage_template" => true, "index" => "logstash-2014.11.17", "template_overwrite" => true, "hosts" => get_host_port() } }
 
   subject { LogStash::Outputs::ElasticSearch.new(settings) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 9.2.3
+  version: 9.2.4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement