logstash-output-elasticsearch 7.4.3-java → 8.0.0-java

data/spec/integration/outputs/index_version_spec.rb

@@ -1,101 +1,100 @@
 require_relative "../../../spec/es_spec_helper"
 require "logstash/outputs/elasticsearch"
 
-if ESHelper.es_version_satisfies?(">= 2")
-  describe "Versioned indexing", :integration => true do
-    require "logstash/outputs/elasticsearch"
 
-    let(:es) { get_client }
+describe "Versioned indexing", :integration => true, :version_greater_than_equal_to_2x => true do
+  require "logstash/outputs/elasticsearch"
 
-    before :each do
-      # Delete all templates first.
-      # Clean ES of data before we start.
-      es.indices.delete_template(:name => "*")
-      # This can fail if there are no indexes, ignore failure.
-      es.indices.delete(:index => "*") rescue nil
-      es.indices.refresh
-    end
+  let(:es) { get_client }
 
-    context "when index only" do
-      subject { LogStash::Outputs::ElasticSearch.new(settings) }
+  before :each do
+    # Delete all templates first.
+    # Clean ES of data before we start.
+    es.indices.delete_template(:name => "*")
+    # This can fail if there are no indexes, ignore failure.
+    es.indices.delete(:index => "*") rescue nil
+    es.indices.refresh
+  end
 
-      before do
-        subject.register
-      end
+  context "when index only" do
+    subject { LogStash::Outputs::ElasticSearch.new(settings) }
 
-      describe "unversioned output" do
-        let(:settings) do
-          {
-            "manage_template" => true,
-            "index" => "logstash-index",
-            "template_overwrite" => true,
-            "hosts" => get_host_port(),
-            "action" => "index",
-            "script_lang" => "groovy",
-            "document_id" => "%{my_id}"
-          }
-        end
+    before do
+      subject.register
+    end
 
-        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 => 'logs', :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 => 'logs', :id => "123", :refresh => true)
-          expect(r2["_version"]).to eq(2)
-          expect(r2["_source"]["message"]).to eq('foobar')
-        end  
+    describe "unversioned output" do
+      let(:settings) do
+        {
+          "manage_template" => true,
+          "index" => "logstash-index",
+          "template_overwrite" => true,
+          "hosts" => get_host_port(),
+          "action" => "index",
+          "script_lang" => "groovy",
+          "document_id" => "%{my_id}"
+        }
       end
 
-      describe "versioned output" do
-        let(:settings) do 
-          {
-            "manage_template" => true,
-            "index" => "logstash-index",
-            "template_overwrite" => true,
-            "hosts" => get_host_port(),
-            "action" => "index",
-            "script_lang" => "groovy",
-            "document_id" => "%{my_id}",
-            "version" => "%{my_version}",
-            "version_type" => "external",
-          }
-        end
+      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 => 'logs', :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 => 'logs', :id => "123", :refresh => true)
+        expect(r2["_version"]).to eq(2)
+        expect(r2["_source"]["message"]).to eq('foobar')
+      end  
+    end
 
-        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 => 'logs', :id => id, :refresh => true)
-          expect(r["_version"]).to eq(99)
-          expect(r["_source"]["message"]).to eq('foo')
-        end
+    describe "versioned output" do
+      let(:settings) do 
+        {
+          "manage_template" => true,
+          "index" => "logstash-index",
+          "template_overwrite" => true,
+          "hosts" => get_host_port(),
+          "action" => "index",
+          "script_lang" => "groovy",
+          "document_id" => "%{my_id}",
+          "version" => "%{my_version}",
+          "version_type" => "external",
+        }
+      end
+
+      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 => 'logs', :id => id, :refresh => true)
+        expect(r["_version"]).to eq(99)
+        expect(r["_source"]["message"]).to eq('foo')
+      end
 
-        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 => 'logs', :id => id, :refresh => true)
-          expect(r["_version"]).to eq(99)
-          expect(r["_source"]["message"]).to eq('foo')
+      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 => 'logs', :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 => 'logs', :id => id, :refresh => true)
-          expect(r2["_version"]).to eq(99)
-          expect(r2["_source"]["message"]).to eq('foo')
-        end
+        subject.multi_receive([LogStash::Event.new("my_id" => id, "my_version" => "98", "message" => "foo")])
+        r2 = es.get(:index => 'logstash-index', :type => 'logs', :id => id, :refresh => true)
+        expect(r2["_version"]).to eq(99)
+        expect(r2["_source"]["message"]).to eq('foo')
+      end
 
-        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 => 'logs', :id => id, :refresh => true)
-          expect(r["_version"]).to eq(99)
-          expect(r["_source"]["message"]).to eq('foo')
+      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 => 'logs', :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 => 'logs', :id => id, :refresh => true)
-          expect(r2["_version"]).to eq(100)
-          expect(r2["_source"]["message"]).to eq('foo')
-        end
+        subject.multi_receive([LogStash::Event.new("my_id" => id, "my_version" => "100", "message" => "foo")])
+        r2 = es.get(:index => 'logstash-index', :type => 'logs', :id => id, :refresh => true)
+        expect(r2["_version"]).to eq(100)
+        expect(r2["_source"]["message"]).to eq('foo')
       end
     end
   end

data/spec/integration/outputs/ingest_pipeline_spec.rb

@@ -1,19 +1,18 @@
 require_relative "../../../spec/es_spec_helper"
 
-if ESHelper.es_version_satisfies?(">= 5")
-  describe "Ingest pipeline execution behavior", :integration => true do
-    subject! do
-      require "logstash/outputs/elasticsearch"
-      settings = {
-        "hosts" => "#{get_host_port()}",
-        "pipeline" => "apache-logs"
-      }
-      next LogStash::Outputs::ElasticSearch.new(settings)
-    end
+describe "Ingest pipeline execution behavior", :integration => true, :version_greater_than_equal_to_5x => true do
+  subject! do
+    require "logstash/outputs/elasticsearch"
+    settings = {
+      "hosts" => "#{get_host_port()}",
+      "pipeline" => "apache-logs"
+    }
+    next LogStash::Outputs::ElasticSearch.new(settings)
+  end
 
-    let(:ftw_client) { FTW::Agent.new }
-    let(:ingest_url) { "http://#{get_host_port()}/_ingest/pipeline/apache-logs" }
-    let(:apache_logs_pipeline) { '
+  let(:ftw_client) { FTW::Agent.new }
+  let(:ingest_url) { "http://#{get_host_port()}/_ingest/pipeline/apache-logs" }
+  let(:apache_logs_pipeline) { '
     {
       "description" : "Pipeline to parse Apache logs",
       "processors" : [
@@ -25,53 +24,52 @@ if ESHelper.es_version_satisfies?(">= 5")
         }
       ]
     }'
-    }
+  }
 
-    before :each do
-      # Delete all templates first.
-      require "elasticsearch"
+  before :each do
+    # Delete all templates first.
+    require "elasticsearch"
 
-      # Clean ES of data before we start.
-      @es = get_client
-      @es.indices.delete_template(:name => "*")
+    # Clean ES of data before we start.
+    @es = get_client
+    @es.indices.delete_template(:name => "*")
 
-      # This can fail if there are no indexes, ignore failure.
-      @es.indices.delete(:index => "*") rescue nil
+    # This can fail if there are no indexes, ignore failure.
+    @es.indices.delete(:index => "*") rescue nil
 
-      # delete existing ingest pipeline
-      req = ftw_client.delete(ingest_url)
-      ftw_client.execute(req)
+    # delete existing ingest pipeline
+    req = ftw_client.delete(ingest_url)
+    ftw_client.execute(req)
 
-      # register pipeline
-      req = ftw_client.put(ingest_url, :body => apache_logs_pipeline)
-      req.headers["Content-Type"] = "application/json"
-      ftw_client.execute(req)
+    # register pipeline
+    req = ftw_client.put(ingest_url, :body => apache_logs_pipeline)
+    req.headers["Content-Type"] = "application/json"
+    ftw_client.execute(req)
 
-      #TODO: Use esclient
-      #@es.ingest.put_pipeline :id => 'apache_pipeline', :body => pipeline_defintion
+    #TODO: Use esclient
+    #@es.ingest.put_pipeline :id => 'apache_pipeline', :body => pipeline_defintion
 
-      subject.register
-      subject.multi_receive([LogStash::Event.new("message" => '183.60.215.50 - - [01/Jun/2015:18:00:00 +0000] "GET /scripts/netcat-webserver HTTP/1.1" 200 182 "-" "Mozilla/5.0 (compatible; EasouSpider; +http://www.easou.com/search/spider.html)"')])
-      @es.indices.refresh
+    subject.register
+    subject.multi_receive([LogStash::Event.new("message" => '183.60.215.50 - - [01/Jun/2015:18:00:00 +0000] "GET /scripts/netcat-webserver HTTP/1.1" 200 182 "-" "Mozilla/5.0 (compatible; EasouSpider; +http://www.easou.com/search/spider.html)"')])
+    @es.indices.refresh
 
-      #Wait or fail until everything's indexed.
-      Stud::try(20.times) do
-        r = @es.search
-        insist { r["hits"]["total"] } == 1
-      end
+    #Wait or fail until everything's indexed.
+    Stud::try(20.times) do
+      r = @es.search
+      insist { r["hits"]["total"] } == 1
     end
+  end
 
-    it "indexes using the proper pipeline" do
-      results = @es.search(:index => 'logstash-*', :q => "message:\"netcat\"")
-      insist { results["hits"]["total"] } == 1
-      insist { results["hits"]["hits"][0]["_source"]["response"] } == "200"
-      insist { results["hits"]["hits"][0]["_source"]["bytes"] } == "182"
-      insist { results["hits"]["hits"][0]["_source"]["verb"] } == "GET"
-      insist { results["hits"]["hits"][0]["_source"]["request"] } == "/scripts/netcat-webserver"
-      insist { results["hits"]["hits"][0]["_source"]["auth"] } == "-"
-      insist { results["hits"]["hits"][0]["_source"]["ident"] } == "-"
-      insist { results["hits"]["hits"][0]["_source"]["clientip"] } == "183.60.215.50"
-      insist { results["hits"]["hits"][0]["_source"]["junkfieldaaaa"] } == nil
-    end
+  it "indexes using the proper pipeline" do
+    results = @es.search(:index => 'logstash-*', :q => "message:\"netcat\"")
+    insist { results["hits"]["total"] } == 1
+    insist { results["hits"]["hits"][0]["_source"]["response"] } == "200"
+    insist { results["hits"]["hits"][0]["_source"]["bytes"] } == "182"
+    insist { results["hits"]["hits"][0]["_source"]["verb"] } == "GET"
+    insist { results["hits"]["hits"][0]["_source"]["request"] } == "/scripts/netcat-webserver"
+    insist { results["hits"]["hits"][0]["_source"]["auth"] } == "-"
+    insist { results["hits"]["hits"][0]["_source"]["ident"] } == "-"
+    insist { results["hits"]["hits"][0]["_source"]["clientip"] } == "183.60.215.50"
+    insist { results["hits"]["hits"][0]["_source"]["junkfieldaaaa"] } == nil
   end
 end

data/spec/integration/outputs/painless_update_spec.rb

@@ -1,188 +1,148 @@
 require_relative "../../../spec/es_spec_helper"
 
-if ESHelper.es_version_satisfies?(">= 5")
-  describe "Update actions using painless scripts", :integration => true, :update_tests => 'painless' do
-    require "logstash/outputs/elasticsearch"
+describe "Update actions using painless scripts", :integration => true, :update_tests => 'painless', :version_greater_than_equal_to_5x => true do
+  require "logstash/outputs/elasticsearch"
+
+  def get_es_output( options={} )
+    settings = {
+      "manage_template" => true,
+      "index" => "logstash-update",
+      "template_overwrite" => true,
+      "hosts" => get_host_port(),
+      "action" => "update",
+      "script_lang" => "painless"
+    }
+    LogStash::Outputs::ElasticSearch.new(settings.merge!(options))
+  end
 
-    def get_es_output( options={} )
-      settings = {
-        "manage_template" => true,
-        "index" => "logstash-update",
-        "template_overwrite" => true,
-        "hosts" => get_host_port(),
-        "action" => "update"
-      }
-      if ESHelper.es_version_satisfies?('<6')
-        settings.merge!({"script_lang" => "painless"})
-      end
-      LogStash::Outputs::ElasticSearch.new(settings.merge!(options))
-    end
+  before :each do
+    @es = get_client
+    # Delete all templates first.
+    # Clean ES of data before we start.
+    @es.indices.delete_template(:name => "*")
+    # This can fail if there are no indexes, ignore failure.
+    @es.indices.delete(:index => "*") rescue nil
+    @es.index(
+      :index => 'logstash-update',
+      :type => 'logs',
+      :id => "123",
+      :body => { :message => 'Test', :counter => 1 }
+    )
+    @es.indices.refresh
+  end
 
-    before :each do
-      @es = get_client
-      # Delete all templates first.
-      # Clean ES of data before we start.
-      @es.indices.delete_template(:name => "*")
-      # This can fail if there are no indexes, ignore failure.
-      @es.indices.delete(:index => "*") rescue nil
-      @es.index(
-        :index => 'logstash-update',
-        :type => 'logs',
-        :id => "123",
-        :body => { :message => 'Test', :counter => 1 }
-      )
-      @es.indices.refresh
+  context "scripted updates" do
+    it "should increment a counter with event/doc 'count' variable" do
+      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 => 'logs', :id => "123", :refresh => true)
+      insist { r["_source"]["counter"] } == 3
     end
 
-    context "scripted updates" do
-      if ESHelper.es_version_satisfies?('<6')
-        context 'with file based scripts' do
-          it "should increment a counter with event/doc 'count' variable" do
-            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 => 'logs', :id => "123", :refresh => true)
-            insist { r["_source"]["counter"] } == 3
-          end
-
-          it "should increment a counter with event/doc '[data][count]' nested variable" do
-            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 => 'logs', :id => "123", :refresh => true)
-            insist { r["_source"]["counter"] } == 4
-          end
-        end
-      end
-
-      it "should increment a counter with event/doc 'count' variable with inline script" do
-        subject = get_es_output({
-          'document_id' => "123",
-          'script' => 'ctx._source.counter += params.event.counter',
-          'script_type' => 'inline'
-        })
-        subject.register
-        subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
-        insist { r["_source"]["counter"] } == 4
-      end
-
-      it "should increment a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
-        subject = get_es_output({
-          'document_id' => "123",
-          'doc_as_upsert' => true,
-          'script' => 'if( ctx._source.containsKey("counter") ){ ctx._source.counter += params.event.counter; } else { ctx._source.counter = params.event.counter; }',
-          'script_type' => 'inline'
-        })
-        subject.register
-        subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
-        insist { r["_source"]["counter"] } == 4
-      end
-
-      it "should, with new doc, set a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
-        subject = get_es_output({
-          'document_id' => "456",
-          'doc_as_upsert' => true,
-          'script' => 'if( ctx._source.containsKey("counter") ){ ctx._source.counter += params.event.counter; } else { ctx._source.counter = params.event.counter; }',
-          'script_type' => 'inline'
-        })
-        subject.register
-        subject.multi_receive([LogStash::Event.new("counter" => 3 )])
-        r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "456", :refresh => true)
-        insist { r["_source"]["counter"] } == 3
-      end
-
-      context 'with an indexed script' do
-        it "should increment a counter with event/doc 'count' variable with indexed script" do
-          if ESHelper.es_version_satisfies?('<6')
-            @es.perform_request(:put, "_scripts/painless/indexed_update", {}, {"script" => "ctx._source.counter += params.event.count" })
-          else
-            @es.perform_request(:put, "_scripts/indexed_update", {}, {"script" => {"source" => "ctx._source.counter += params.event.count", "lang" => "painless"}})
-          end
-
-          plugin_parameters = {
-            'document_id' => "123",
-            'script' => 'indexed_update',
-            'script_type' => 'indexed'
-          }
-
-          if ESHelper.es_version_satisfies?('>= 6.0.0')
-            plugin_parameters.merge!('script_lang' => '')
-          end
+    it "should increment a counter with event/doc '[data][count]' nested variable" do
+      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 => 'logs', :id => "123", :refresh => true)
+      insist { r["_source"]["counter"] } == 4
+    end
 
-          subject = get_es_output(plugin_parameters)
-          subject.register
-          subject.multi_receive([LogStash::Event.new("count" => 4 )])
-          r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
-          insist { r["_source"]["counter"] } == 5
-        end
-      end
-     end
+    it "should increment a counter with event/doc 'count' variable with inline script" do
+      subject = get_es_output({
+        'document_id' => "123",
+        'script' => 'ctx._source.counter += params.event.counter',
+        'script_lang' => 'painless',
+        'script_type' => 'inline'
+      })
+      subject.register
+      subject.multi_receive([LogStash::Event.new("counter" => 3 )])
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
+      insist { r["_source"]["counter"] } == 4
+    end
 
-    context "when update with upsert" do
-      it "should create new documents with provided upsert" do
-        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 => 'logs', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'upsert message'
-      end
+    it "should increment a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
+      subject = get_es_output({
+        'document_id' => "123",
+        'doc_as_upsert' => true,
+        'script' => 'if( ctx._source.containsKey("counter") ){ ctx._source.counter += params.event.counter; } else { ctx._source.counter = params.event.counter; }',
+        'script_lang' => 'painless',
+        'script_type' => 'inline'
+      })
+      subject.register
+      subject.multi_receive([LogStash::Event.new("counter" => 3 )])
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
+      insist { r["_source"]["counter"] } == 4
+    end
 
-      it "should create new documents with event/doc as upsert" do
-        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 => 'logs', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'sample message here'
-      end
+    it "should, with new doc, set a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
+      subject = get_es_output({
+        'document_id' => "456",
+        'doc_as_upsert' => true,
+        'script' => 'if( ctx._source.containsKey("counter") ){ ctx._source.counter += params.event.counter; } else { ctx._source.counter = params.event.counter; }',
+        'script_lang' => 'painless',
+        'script_type' => 'inline'
+      })
+      subject.register
+      subject.multi_receive([LogStash::Event.new("counter" => 3 )])
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "456", :refresh => true)
+      insist { r["_source"]["counter"] } == 3
+    end
 
-      it "should fail on documents with event/doc as upsert at external version" do
-        subject = get_es_output({ 'document_id' => "456", 'doc_as_upsert' => true, 'version' => 999, "version_type" => "external" })
-        expect { subject.register }.to raise_error(LogStash::ConfigurationError)
-      end
+    it "should increment a counter with event/doc 'count' variable with indexed script" do
+      @es.put_script lang: 'painless', id: 'indexed_update', body: { script: 'ctx._source.counter += params.event.count' }
+      subject = get_es_output({
+        'document_id' => "123",
+        'script' => 'indexed_update',
+        'script_lang' => 'painless',
+        'script_type' => 'indexed'
+      })
+      subject.register
+      subject.multi_receive([LogStash::Event.new("count" => 4 )])
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
+      insist { r["_source"]["counter"] } == 5
+    end
+  end  
+    
+  context "when update with upsert" do
+    it "should create new documents with provided upsert" do
+      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 => 'logs', :id => "456", :refresh => true)
+      insist { r["_source"]["message"] } == 'upsert message'
     end
 
-    context "updates with scripted upsert" do
-      if ESHelper.es_version_satisfies?('<6')
-        context 'with file based scripts' do
-          it "should create new documents with upsert content" do
-            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 => 'logs', :id => "456", :refresh => true)
-            insist { r["_source"]["message"] } == 'upsert message'
-          end
+    it "should create new documents with event/doc as upsert" do
+      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 => 'logs', :id => "456", :refresh => true)
+      insist { r["_source"]["message"] } == 'sample message here'
+    end
 
-          it "should create new documents with event/doc as script params" do
-            subject = get_es_output({ 'document_id' => "456", 'script' => 'scripted_upsert', 'scripted_upsert' => true, 'script_type' => 'file' })
-            subject.register
-            subject.multi_receive([LogStash::Event.new("counter" => 1)])
-            @es.indices.refresh
-            r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "456", :refresh => true)
-            insist { r["_source"]["counter"] } == 1
-          end
-        end
-      end
+    it "should fail on documents with event/doc as upsert at external version" do
+      subject = get_es_output({ 'document_id' => "456", 'doc_as_upsert' => true, 'version' => 999, "version_type" => "external" })
+      expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+    end
+  end
 
-      context 'with an inline script' do
-        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 => 'logs', :id => "456", :refresh => true)
-          insist { r["_source"]["message"] } == 'upsert message'
-        end
+  context "updates with scripted upsert" do
+    it "should create new documents with upsert content" do
+      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 => 'logs', :id => "456", :refresh => true)
+      insist { r["_source"]["message"] } == 'upsert message'
+    end
 
-        it "should create new documents with event/doc as script params" do
-          subject = get_es_output({ 'document_id' => "456", 'script' => 'ctx._source.counter = params.event.counter', 'scripted_upsert' => true, 'script_type' => 'inline' })
-          subject.register
-          subject.multi_receive([LogStash::Event.new("counter" => 1)])
-          @es.indices.refresh
-          r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "456", :refresh => true)
-          insist { r["_source"]["counter"] } == 1
-        end
-      end
+    it "should create new documents with event/doc as script params" do
+      subject = get_es_output({ 'document_id' => "456", 'script' => 'scripted_upsert', 'scripted_upsert' => true, 'script_type' => 'file' })
+      subject.register
+      subject.multi_receive([LogStash::Event.new("counter" => 1)])
+      @es.indices.refresh
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "456", :refresh => true)
+      insist { r["_source"]["counter"] } == 1
     end
   end
 end