logstash-output-elasticsearch 7.4.0-java → 7.4.1-java

data/spec/integration/outputs/groovy_update_spec.rb

@@ -1,148 +1,150 @@
 require_relative "../../../spec/es_spec_helper"
 
-describe "Update actions using groovy scripts", :integration => true, :update_tests => 'groovy', :version_greater_than_equal_to_2x => true do
-  require "logstash/outputs/elasticsearch"
+if ESHelper.es_version_satisfies?(">= 2")
+  describe "Update actions using groovy scripts", :integration => true, :update_tests => 'groovy' 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" => "groovy"
-    }
-    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
-
-  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
+    def get_es_output( options={} )
+      settings = {
+        "manage_template" => true,
+        "index" => "logstash-update",
+        "template_overwrite" => true,
+        "hosts" => get_host_port(),
+        "action" => "update",
+        "script_lang" => "groovy"
+      }
+      LogStash::Outputs::ElasticSearch.new(settings.merge!(options))
     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
+    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
 
-    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 += event["counter"]',
-        'script_lang' => 'groovy',
-        '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 "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
 
-    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 += event["counter"]; } else { ctx._source.counter = event["counter"]; }',
-        'script_lang' => 'groovy',
-        '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 '[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
 
-    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 += event["count"]; } else { ctx._source.counter = event["count"]; }',
-        'script_lang' => 'groovy',
-        '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 increment a counter with event/doc 'count' variable with inline script" do
+        subject = get_es_output({
+          'document_id' => "123",
+          'script' => 'ctx._source.counter += event["counter"]',
+          'script_lang' => 'groovy',
+          '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 indexed script" do
-      @es.put_script lang: 'groovy', id: 'indexed_update', body: { script: 'ctx._source.counter += event["count"]' }
-      subject = get_es_output({
-        'document_id' => "123",
-        'script' => 'indexed_update',
-        'script_lang' => 'groovy',
-        '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
+      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 += event["counter"]; } else { ctx._source.counter = event["counter"]; }',
+          'script_lang' => 'groovy',
+          '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 += event["count"]; } else { ctx._source.counter = event["count"]; }',
+          'script_lang' => 'groovy',
+          '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)
+      it "should increment a counter with event/doc 'count' variable with indexed script" do
+        @es.put_script lang: 'groovy', id: 'indexed_update', body: { script: 'ctx._source.counter += event["count"]' }
+        subject = get_es_output({
+          'document_id' => "123",
+          'script' => 'indexed_update',
+          'script_lang' => 'groovy',
+          '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
-  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'
+    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 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 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
 
-    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
+    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' => '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
 end

data/spec/integration/outputs/index_version_spec.rb

@@ -1,100 +1,101 @@
 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"
 
-describe "Versioned indexing", :integration => true, :version_greater_than_equal_to_2x => true do
-  require "logstash/outputs/elasticsearch"
+    let(:es) { get_client }
 
-  let(:es) { get_client }
-
-  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
-
-  context "when index only" do
-    subject { LogStash::Outputs::ElasticSearch.new(settings) }
-
-    before do
-      subject.register
+    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
 
-    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}"
-        }
+    context "when index only" do
+      subject { LogStash::Outputs::ElasticSearch.new(settings) }
+
+      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  
-    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",
-        }
+        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 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 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
 
-        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 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
 
-      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')
+          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
   end