logstash-output-elasticsearch 9.1.1-java → 9.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c72ac7c8b2bd9eb64be1be449a402d64d9808c33d4ad8c723c567d23704a4ae
-  data.tar.gz: e327128618734f8783150fb9e8d347e9fd56b5911ffadec3d042a29fc9f7ffc8
+  metadata.gz: 123fca22f700bc5760a15f5beaa40ecae654e6e9b39fa19a3d8662d04963ab3c
+  data.tar.gz: 495fa3272f872a14cd6b4361017f4cbba5d846cdad47e99321cf06ac2ce66b70
 SHA512:
-  metadata.gz: fa5f19f2277c551466016c91212ed04fa18a3d80d81dea618618c859f2c274f4fd673243c2719450401b7e861f3a197e1a66c8731eb9d8f95d61e9cc68730959
-  data.tar.gz: 393208c3c8911549d05ed94ba39471c982fc997858e22d54b5493b4a2fc008e01173cafbc8ea9e602a984cd41ac0012b555ab24817f0dd0d5dafaf95b468ce5f
+  metadata.gz: ae33f09690b8e90cb679a18b655f9349d6d6204bb9932d6c0ecde987c5871fbd16d60c65e66e52a5d38427a22099611bc5df4ac8ee529c98f6618e5e47a8ea5b
+  data.tar.gz: f2cbe7d567b6f46a3d396b2316db05499209e769415760ddda080f60366ed1e69bcd7ed64d3084742394186b9ff79650d7db7c95fab9aa3715bc074b7a2ed18e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 9.1.2
+  - No user facing changes, removed unnecessary test dep.
+
 ## 9.1.1
   - Docs: Set the default_codec doc attribute.
 

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '9.1.1'
+  s.version         = '9.1.2'
   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"
@@ -9,6 +9,8 @@ Gem::Specification.new do |s|
   s.homepage        = "http://logstash.net/"
   s.require_paths = ["lib"]
 
+  s.platform = RUBY_PLATFORM
+
   # Files
   s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
 
@@ -18,20 +20,12 @@ Gem::Specification.new do |s|
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
+  s.add_runtime_dependency "manticore", '>= 0.5.4', '< 1.0.0'
   s.add_runtime_dependency 'stud', ['>= 0.0.17', '~> 0.0']
   s.add_runtime_dependency 'cabin', ['~> 0.6']
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_development_dependency 'ftw', '~> 0.0.42'
-  s.add_development_dependency 'addressable', "~> 2.3.0" # used by FTW. V 2.5.0 is ruby 2.0 only.
-  s.add_development_dependency 'logstash-codec-plain'
-  s.add_development_dependency 'json' # used by spec/unit/outputs/elasticsearch/http_client/pool_spec.rb
-  s.add_development_dependency 'gzip' # used by spec/integration/outputs/index_spec.rb
-
-  if RUBY_PLATFORM == 'java'
-    s.platform = RUBY_PLATFORM
-    s.add_runtime_dependency "manticore", '>= 0.5.4', '< 1.0.0'
-  end
 
+  s.add_development_dependency 'logstash-codec-plain'
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'flores'
   # Still used in some specs, we should remove this ASAP

data/spec/es_spec_helper.rb

@@ -1,5 +1,5 @@
 require "logstash/devutils/rspec/spec_helper"
-require "ftw"
+require 'manticore'
 require 'elasticsearch'
 
 module ESHelper

data/spec/integration/outputs/compressed_indexing_spec.rb

@@ -1,7 +1,6 @@
 require_relative "../../../spec/es_spec_helper"
 require "logstash/outputs/elasticsearch"
 require "stringio"
-require "gzip"
 
 RSpec::Matchers.define :a_valid_gzip_encoded_string do
   match { |data|

data/spec/integration/outputs/create_spec.rb

@@ -35,7 +35,7 @@ describe "client create actions", :integration => true do
       # Wait or fail until everything's indexed.
       Stud::try(3.times) do
         r = @es.search
-        insist { r["hits"]["total"] } == 1
+        expect(r["hits"]["total"]).to eq(1)
       end
     end
 

data/spec/integration/outputs/groovy_update_spec.rb

@@ -38,7 +38,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject.register
         subject.multi_receive([LogStash::Event.new("count" => 2)])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
-        insist { r["_source"]["counter"] } == 3
+        expect(r["_source"]["counter"]).to eq(3)
       end
 
       it "should increment a counter with event/doc '[data][count]' nested variable" do
@@ -46,7 +46,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject.register
         subject.multi_receive([LogStash::Event.new("data" => { "count" => 3 })])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
-        insist { r["_source"]["counter"] } == 4
+        expect(r["_source"]["counter"]).to eq(4)
       end
 
       it "should increment a counter with event/doc 'count' variable with inline script" do
@@ -59,7 +59,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)
-        insist { r["_source"]["counter"] } == 4
+        expect(r["_source"]["counter"]).to eq(4)
       end
 
       it "should increment a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
@@ -73,7 +73,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)
-        insist { r["_source"]["counter"] } == 4
+        expect(r["_source"]["counter"]).to eq(4)
       end
 
       it "should, with new doc, set a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
@@ -87,7 +87,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)
-        insist { r["_source"]["counter"] } == 3
+        expect(r["_source"]["counter"]).to eq(3)
       end
 
       it "should increment a counter with event/doc 'count' variable with indexed script" do
@@ -101,7 +101,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)
-        insist { r["_source"]["counter"] } == 5
+        expect(r["_source"]["counter"]).to eq(5)
       end
     end
 
@@ -111,7 +111,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'upsert message'
+        expect(r["_source"]["message"]).to eq('upsert message')
       end
 
       it "should create new documents with event/doc as upsert" do
@@ -119,7 +119,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'sample message here'
+        expect(r["_source"]["message"]).to eq('sample message here')
       end
 
       it "should fail on documents with event/doc as upsert at external version" do
@@ -134,7 +134,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'upsert message'
+        expect(r["_source"]["message"]).to eq('upsert message')
       end
 
       it "should create new documents with event/doc as script params" do
@@ -143,7 +143,7 @@ if ESHelper.es_version_satisfies?('>= 2', '< 6')
         subject.multi_receive([LogStash::Event.new("counter" => 1)])
         @es.indices.refresh
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["counter"] } == 1
+        expect(r["_source"]["counter"]).to eq(1)
       end
     end
   end

data/spec/integration/outputs/ingest_pipeline_spec.rb

@@ -11,7 +11,7 @@ if ESHelper.es_version_satisfies?(">= 5")
       next LogStash::Outputs::ElasticSearch.new(settings)
     end
 
-    let(:ftw_client) { FTW::Agent.new }
+    let(:http_client) { Manticore::Client.new }
     let(:ingest_url) { "http://#{get_host_port()}/_ingest/pipeline/apache-logs" }
     let(:apache_logs_pipeline) { '
     {
@@ -39,13 +39,10 @@ if ESHelper.es_version_satisfies?(">= 5")
       @es.indices.delete(:index => "*") rescue nil
 
       # delete existing ingest pipeline
-      req = ftw_client.delete(ingest_url)
-      ftw_client.execute(req)
+      http_client.delete(ingest_url).call
 
       # register pipeline
-      req = ftw_client.put(ingest_url, :body => apache_logs_pipeline)
-      req.headers["Content-Type"] = "application/json"
-      ftw_client.execute(req)
+      http_client.put(ingest_url, :body => apache_logs_pipeline, :headers => {"Content-Type" => "application/json" }).call
 
       #TODO: Use esclient
       #@es.ingest.put_pipeline :id => 'apache_pipeline', :body => pipeline_defintion
@@ -57,21 +54,21 @@ if ESHelper.es_version_satisfies?(">= 5")
       #Wait or fail until everything's indexed.
       Stud::try(20.times) do
         r = @es.search
-        insist { r["hits"]["total"] } == 1
+        expect(r["hits"]["total"]).to eq(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
+      expect(results["hits"]["total"]).to eq(1)
+      expect(results["hits"]["hits"][0]["_source"]["response"]).to eq("200")
+      expect(results["hits"]["hits"][0]["_source"]["bytes"]).to eq("182")
+      expect(results["hits"]["hits"][0]["_source"]["verb"]).to eq("GET")
+      expect(results["hits"]["hits"][0]["_source"]["request"]).to eq("/scripts/netcat-webserver")
+      expect(results["hits"]["hits"][0]["_source"]["auth"]).to eq("-")
+      expect(results["hits"]["hits"][0]["_source"]["ident"]).to eq("-")
+      expect(results["hits"]["hits"][0]["_source"]["clientip"]).to eq("183.60.215.50")
+      expect(results["hits"]["hits"][0]["_source"]["junkfieldaaaa"]).to eq(nil)
     end
   end
 end

data/spec/integration/outputs/painless_update_spec.rb

@@ -42,7 +42,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject.register
             subject.multi_receive([LogStash::Event.new("count" => 2)])
             r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
-            insist { r["_source"]["counter"] } == 3
+            expect(r["_source"]["counter"]).to eq(3)
           end
 
           it "should increment a counter with event/doc '[data][count]' nested variable" do
@@ -50,7 +50,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject.register
             subject.multi_receive([LogStash::Event.new("data" => { "count" => 3 })])
             r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
-            insist { r["_source"]["counter"] } == 4
+            expect(r["_source"]["counter"]).to eq(4)
           end
         end
       end
@@ -64,7 +64,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)
-        insist { r["_source"]["counter"] } == 4
+        expect(r["_source"]["counter"]).to eq(4)
       end
 
       it "should increment a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
@@ -77,7 +77,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)
-        insist { r["_source"]["counter"] } == 4
+        expect(r["_source"]["counter"]).to eq(4)
       end
 
       it "should, with new doc, set a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
@@ -90,7 +90,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)
-        insist { r["_source"]["counter"] } == 3
+        expect(r["_source"]["counter"]).to eq(3)
       end
 
       context 'with an indexed script' do
@@ -115,7 +115,7 @@ if ESHelper.es_version_satisfies?(">= 5")
           subject.register
           subject.multi_receive([LogStash::Event.new("count" => 4 )])
           r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
-          insist { r["_source"]["counter"] } == 5
+          expect(r["_source"]["counter"]).to eq(5)
         end
       end
      end
@@ -126,7 +126,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'upsert message'
+        expect(r["_source"]["message"]).to eq('upsert message')
       end
 
       it "should create new documents with event/doc as upsert" do
@@ -134,7 +134,7 @@ if ESHelper.es_version_satisfies?(">= 5")
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'sample message here'
+        expect(r["_source"]["message"]).to eq('sample message here')
       end
 
       it "should fail on documents with event/doc as upsert at external version" do
@@ -151,7 +151,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject.register
             subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
             r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-            insist { r["_source"]["message"] } == 'upsert message'
+            expect(r["_source"]["message"]).to eq('upsert message')
           end
 
           it "should create new documents with event/doc as script params" do
@@ -160,7 +160,7 @@ if ESHelper.es_version_satisfies?(">= 5")
             subject.multi_receive([LogStash::Event.new("counter" => 1)])
             @es.indices.refresh
             r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-            insist { r["_source"]["counter"] } == 1
+            expect(r["_source"]["counter"]).to eq(1)
           end
         end
       end
@@ -171,7 +171,7 @@ if ESHelper.es_version_satisfies?(">= 5")
           subject.register
           subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
           r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-          insist { r["_source"]["message"] } == 'upsert message'
+          expect(r["_source"]["message"]).to eq('upsert message')
         end
 
         it "should create new documents with event/doc as script params" do
@@ -180,7 +180,7 @@ if ESHelper.es_version_satisfies?(">= 5")
           subject.multi_receive([LogStash::Event.new("counter" => 1)])
           @es.indices.refresh
           r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-          insist { r["_source"]["counter"] } == 1
+          expect(r["_source"]["counter"]).to eq(1)
         end
       end
     end

data/spec/integration/outputs/parent_spec.rb

@@ -39,7 +39,7 @@ if ESHelper.es_version_satisfies?("<= 5.x")
           data = response.body
           result = LogStash::Json.load(data)
           cur_count = result["count"]
-          insist { cur_count } == event_count
+          expect(cur_count).to eq(event_count)
         end
       end
     end
@@ -131,7 +131,7 @@ if ESHelper.es_version_satisfies?(">= 5.6")
           data = response.body
           result = LogStash::Json.load(data)
           cur_count = result["count"]
-          insist { cur_count } == event_count
+          expect(cur_count).to eq(event_count)
         end
       end
     end

data/spec/integration/outputs/routing_spec.rb

@@ -19,18 +19,17 @@ shared_examples "a routing indexer" do
     it "ships events" do
       index_url = "http://#{get_host_port()}/#{index}"
 
-      ftw = FTW::Agent.new
-      ftw.post!("#{index_url}/_refresh")
+      client = Manticore::Client.new
+      client.post("#{index_url}/_refresh").call
 
       # Wait until all events are available.
       Stud::try(10.times) do
         data = ""
 
-        response = ftw.get!("#{index_url}/_count?q=*&routing=#{routing}")
-        response.read_body { |chunk| data << chunk }
-        result = LogStash::Json.load(data)
+        response = client.get("#{index_url}/_count?q=*&routing=#{routing}").call
+        result = LogStash::Json.load(response.body)
         cur_count = result["count"]
-        insist { cur_count } == event_count
+        expect(cur_count).to eq(event_count)
       end
     end
 end

data/spec/integration/outputs/templates_5x_spec.rb

@@ -41,44 +41,44 @@ if ESHelper.es_version_satisfies?(">= 5")
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
         r = @es.search
-        insist { r["hits"]["total"] } == 8
+        expect(r["hits"]["total"]).to eq(8)
       end
     end
 
     it "permits phrase searching on string fields" do
       results = @es.search(:q => "message:\"sample message\"")
-      insist { results["hits"]["total"] } == 1
-      insist { results["hits"]["hits"][0]["_source"]["message"] } == "sample message here"
+      expect(results["hits"]["total"]).to eq(1)
+      expect(results["hits"]["hits"][0]["_source"]["message"]).to eq("sample message here")
     end
 
     it "numbers dynamically map to a numeric type and permit range queries" do
       results = @es.search(:q => "somevalue:[5 TO 105]")
-      insist { results["hits"]["total"] } == 2
+      expect(results["hits"]["total"]).to eq(2)
 
       values = results["hits"]["hits"].collect { |r| r["_source"]["somevalue"] }
-      insist { values }.include?(10)
-      insist { values }.include?(100)
-      reject { values }.include?(1)
+      expect(values).to include(10)
+      expect(values).to include(100)
+      expect(values).to_not include(1)
     end
 
     it "does not create .keyword field for top-level message field" do
       results = @es.search(:q => "message.keyword:\"sample message here\"")
-      insist { results["hits"]["total"] } == 0
+      expect(results["hits"]["total"]).to eq(0)
     end
 
     it "creates .keyword field for nested message fields" do
       results = @es.search(:q => "somemessage.message.keyword:\"sample nested message here\"")
-      insist { results["hits"]["total"] } == 1
+      expect(results["hits"]["total"]).to eq(1)
     end
 
     it "creates .keyword field from any string field which is not_analyzed" do
       results = @es.search(:q => "country.keyword:\"us\"")
-      insist { results["hits"]["total"] } == 1
-      insist { results["hits"]["hits"][0]["_source"]["country"] } == "us"
+      expect(results["hits"]["total"]).to eq(1)
+      expect(results["hits"]["hits"][0]["_source"]["country"]).to eq("us")
 
       # partial or terms should not work.
       results = @es.search(:q => "country.keyword:\"u\"")
-      insist { results["hits"]["total"] } == 0
+      expect(results["hits"]["total"]).to eq(0)
     end
 
     it "make [geoip][location] a geo_point" do
@@ -89,10 +89,10 @@ if ESHelper.es_version_satisfies?(">= 5")
       results = @es.search(:body => { "aggregations" => { "my_agg" => { "terms" => { "field" => "country.keyword" } } } })["aggregations"]["my_agg"]
       terms = results["buckets"].collect { |b| b["key"] }
 
-      insist { terms }.include?("us")
+      expect(terms).to include("us")
 
       # 'at' is a stopword, make sure stopwords are not ignored.
-      insist { terms }.include?("at")
+      expect(terms).to include("at")
     end
   end
 end

data/spec/integration/outputs/templates_spec.rb

@@ -41,44 +41,44 @@ if ESHelper.es_version_satisfies?("< 5")
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
         r = @es.search
-        insist { r["hits"]["total"] } == 8
+        expect(r["hits"]["total"]).to eq(8)
       end
     end
 
     it "permits phrase searching on string fields" do
       results = @es.search(:q => "message:\"sample message\"")
-      insist { results["hits"]["total"] } == 1
-      insist { results["hits"]["hits"][0]["_source"]["message"] } == "sample message here"
+      expect(results["hits"]["total"]).to eq(1)
+      expect(results["hits"]["hits"][0]["_source"]["message"]).to eq("sample message here")
     end
 
     it "numbers dynamically map to a numeric type and permit range queries" do
       results = @es.search(:q => "somevalue:[5 TO 105]")
-      insist { results["hits"]["total"] } == 2
+      expect(results["hits"]["total"]).to eq(2)
 
       values = results["hits"]["hits"].collect { |r| r["_source"]["somevalue"] }
-      insist { values }.include?(10)
-      insist { values }.include?(100)
-      reject { values }.include?(1)
+      expect(values).to include(10)
+      expect(values).to include(100)
+      expect(values).to_not include(1)
     end
 
     it "does not create .raw field for the message field" do
       results = @es.search(:q => "message.raw:\"sample message here\"")
-      insist { results["hits"]["total"] } == 0
+      expect(results["hits"]["total"]).to eq(0)
     end
 
     it "creates .raw field for nested message fields" do
       results = @es.search(:q => "somemessage.message.raw:\"sample nested message here\"")
-      insist { results["hits"]["total"] } == 1
+      expect(results["hits"]["total"]).to eq(1)
     end
 
     it "creates .raw field from any string field which is not_analyzed" do
       results = @es.search(:q => "country.raw:\"us\"")
-      insist { results["hits"]["total"] } == 1
-      insist { results["hits"]["hits"][0]["_source"]["country"] } == "us"
+      expect(results["hits"]["total"]).to eq(1)
+      expect(results["hits"]["hits"][0]["_source"]["country"]).to eq("us")
 
       # partial or terms should not work.
       results = @es.search(:q => "country.raw:\"u\"")
-      insist { results["hits"]["total"] } == 0
+      expect(results["hits"]["total"]).to eq(0)
     end
 
     it "make [geoip][location] a geo_point" do
@@ -89,10 +89,10 @@ if ESHelper.es_version_satisfies?("< 5")
       results = @es.search(:body => { "aggregations" => { "my_agg" => { "terms" => { "field" => "country.raw" } } } })["aggregations"]["my_agg"]
       terms = results["buckets"].collect { |b| b["key"] }
 
-      insist { terms }.include?("us")
+      expect(terms).to include("us")
 
       # 'at' is a stopword, make sure stopwords are not ignored.
-      insist { terms }.include?("at")
+      expect(terms).to include("at")
     end
   end
 end

data/spec/integration/outputs/update_spec.rb

@@ -49,7 +49,7 @@ if ESHelper.es_version_satisfies?(">= 2")
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "updated message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "123", :refresh => true)
-        insist { r["_source"]["message"] } == 'updated message here'
+        expect(r["_source"]["message"]).to eq('updated message here')
       end
 
       # The es ruby client treats the data field differently. Make sure this doesn't
@@ -59,8 +59,8 @@ if ESHelper.es_version_satisfies?(">= 2")
         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)
-        insist { r["_source"]["data"] } == 'updated message here'
-        insist { r["_source"]["message"] } == 'foo'
+        expect(r["_source"]["data"]).to eq('updated message here')
+        expect(r["_source"]["message"]).to eq('foo')
       end
 
       it "should allow default (internal) version" do
@@ -96,7 +96,7 @@ if ESHelper.es_version_satisfies?(">= 2")
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'upsert message'
+        expect(r["_source"]["message"]).to eq('upsert message')
       end
 
       it "should create new documents with event/doc as upsert" do
@@ -104,7 +104,7 @@ if ESHelper.es_version_satisfies?(">= 2")
         subject.register
         subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
         r = @es.get(:index => 'logstash-update', :type => 'doc', :id => "456", :refresh => true)
-        insist { r["_source"]["message"] } == 'sample message here'
+        expect(r["_source"]["message"]).to eq('sample message here')
       end
 
       it "should fail on documents with event/doc as upsert at external version" do

data/spec/unit/outputs/elasticsearch/http_client_spec.rb

@@ -8,7 +8,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
     opts = {
       :hosts => [::LogStash::Util::SafeURI.new("127.0.0.1")],
       :logger => Cabin::Channel.get,
-      :metric => ::LogStash::Instrument::NamespacedNullMetric.new(:dummy_metric)
+      :metric => ::LogStash::Instrument::NullMetric.new(:dummy).namespace(:alsodummy)
     }
 
     if !ssl.nil? # Shortcut to set this

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 9.1.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  name: manticore
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -64,34 +84,6 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.42
-  name: ftw
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.42
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  name: addressable
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -106,54 +98,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: json
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: gzip
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  name: manticore
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -286,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Stores logs in Elasticsearch