logstash-output-elasticsearch 4.1.0-java → 4.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1463814b1c058872439a7cff351407b2c2a6d442
-  data.tar.gz: 28b8279a5cf3bb64e2003bc7e5272989918a2eb7
+  metadata.gz: 0063a188b7bd2e7bc419042bca990a04b7680b7a
+  data.tar.gz: 0a029a7275a7eba0e201457275f4490074ed92f1
 SHA512:
-  metadata.gz: 7d7ac9a08e59b1698121a9aaf13b195a032961a3df092c7a58ed183611869efe95803928e5dce25fe8b8e9a0394a1eae7e15cb4b2fa4b7b44a0bee1362321bdb
-  data.tar.gz: a97ecd3ea4a6d391b7b7e77d38956d9c7c8089ca5406513301a2e46e5f1e12fb82edd4f0a0dce048a473e903965012246c8b99978fb207eae384fb35a4887238
+  metadata.gz: 873f0c289ed656c300e0e2df2efee4cdb8f10efc7b6f5fd558715fc02ce02327d39be37434582c2704d2379a02d8c50b221cf8434a1025ee85e6a507b0f73629
+  data.tar.gz: 04a9a3a18264487cfda5328fecdb01737dcb5dac27b2c08e6db2f5de17ba56cbee1d3cb81739850cccf4142de5f5d2d7c9c9e65a593c70254d6833a155cb5786

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.1.1
+
+- Fix bug where setting credentials would cause fatal errors. See https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/441
+
 ## 4.1.0
 - breaking,config: Removed obsolete config `host` and `port`. Please use the `hosts` config with the `[host:port]` syntax.
 - breaking,config: Removed obsolete config `index_type`. Please use `document_type` instead.

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

@@ -90,9 +90,10 @@ module LogStash; module Outputs; class ElasticSearch;
       adapter_options = {
         :socket_timeout => timeout,
         :request_timeout => timeout,
-        :proxy => client_settings[:proxy]
       }
 
+      adapter_options[:proxy] = client_settings[:proxy] if client_settings[:proxy]
+
       # Having this explicitly set to nil is an error
       if client_settings[:pool_max]
         adapter_options[:pool_max] = client_settings[:pool_max]

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '4.1.0'
+  s.version         = '4.1.1'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to 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/unit/outputs/elasticsearch_proxy_spec.rb

@@ -42,6 +42,16 @@ describe "Proxy option" do
         end
       end
     end
+
+    context "when not specified" do
+      let(:proxy) { nil }
+      
+      it "should not send the proxy option to manticore" do
+        expect(::Manticore::Client).to have_received(:new) do |options|
+          expect(options).not_to include(:proxy)
+        end
+      end
+    end
   end
 
   describe "invalid configs" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement