logstash-output-elasticsearch 9.2.1-java → 9.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4efe2864f268887acaf9d9daf5f608ee81f969aa3c543c27aea8af3f6ecff2ac
-  data.tar.gz: 7bcf92ede9cdfc411426c8102debd0db01757c2142be6aea56f1f3c6160d8e6d
+  metadata.gz: 2e4f54b01a626097bb553a3955afb9718ba7646c14f08ad0fe0eb89c15162b36
+  data.tar.gz: 957ae579af4d96853c4be2da24802cf8da56d6277868ed2353696a5aa607b0bf
 SHA512:
-  metadata.gz: 0dba114c43a756932d1721b0a6ed6ae034276d547be111135eb7e1961cf04218b5de2ee75b864ca6ac60503105d0bb243de7957d6ef0b63d735d37571436e960
-  data.tar.gz: e54ce98660279425ba01fb7034a9258752ee80c1469492ddcd357a26f971ea5936c3fb23a1645dd3a137301f1889d4b2cc356cea72b34debf81a020aab33a2bb
+  metadata.gz: 366093f142db6dcf2db65ca6ca8cf342b67ac2ac61b4a1ba9bd7820701844fb2b950096438354136f7f0d9e67a70e5900b0231864d7e1e804b1705cb155f97b1
+  data.tar.gz: 1942f02dffe708e9f8bbd2b6ec3c4c134577625ced71012415cb8fcf87e6ffdad7fc5ae53fc0690def17fa2e574719c42ca590a44fdc91ad34b1caf2a017fdc8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 9.2.3
+  - Tweaked logging statements to reduce verbosity
+
+## 9.2.2
+  - Fixed numerous issues relating to builds on Travis [#799](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/799)
+
 ## 9.2.1
   - Added text offering hosted Elasticsearch service
 

data/Gemfile

@@ -9,3 +9,7 @@ if Dir.exist?(logstash_path) && use_logstash_source
   gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
   gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
 end
+
+if RUBY_VERSION == "1.9.3"
+  gem 'rake', '12.2.1'
+end

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

@@ -240,7 +240,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       # Try to keep locking granularity low such that we don't affect IO...
       @state_mutex.synchronize { @url_info.select {|url,meta| meta[:state] != :alive } }.each do |url,meta|
         begin
-          logger.info("Running health check to see if an Elasticsearch connection is working",
+          logger.debug("Running health check to see if an Elasticsearch connection is working",
                         :healthcheck_url => url, :path => @healthcheck_path)
           response = perform_request_to_url(url, :head, @healthcheck_path)
           # If no exception was raised it must have succeeded!
@@ -379,9 +379,6 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       # These aren't discarded from the pool because these are often very transient
       # errors
       raise e
-    rescue => e
-      logger.warn("UNEXPECTED POOL ERROR", :e => e)
-      raise e
     ensure
       return_connection(url)
     end

data/logstash-output-elasticsearch.gemspec

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

@@ -2,12 +2,6 @@ require "logstash/devutils/rspec/spec_helper"
 require 'manticore'
 require 'elasticsearch'
 
-# by default exclude secure_integration tests unless requested
-# normal integration specs are already excluded by devutils' spec helper
-RSpec.configure do |config|
-   config.filter_run_excluding config.exclusion_filter.add(:secure_integration => true)
-end
-
 module ESHelper
   def get_host_port
     "127.0.0.1:9200"

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -11,13 +11,15 @@ describe LogStash::Outputs::ElasticSearch do
 
   before(:each) do
     if do_register
-      subject.register
+      # Build the client and set mocks before calling register to avoid races.
+      subject.build_client
 
       # Rspec mocks can't handle background threads, so... we can't use any
       allow(subject.client.pool).to receive(:start_resurrectionist)
       allow(subject.client.pool).to receive(:start_sniffer)
       allow(subject.client.pool).to receive(:healthcheck!)
       allow(subject.client).to receive(:maximum_seen_major_version).at_least(:once).and_return(maximum_seen_major_version)
+      subject.register
       subject.client.pool.adapter.manticore.respond_with(:body => "{}")
     end
   end

metadata

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