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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1463814b1c058872439a7cff351407b2c2a6d442
4
- data.tar.gz: 28b8279a5cf3bb64e2003bc7e5272989918a2eb7
3
+ metadata.gz: 0063a188b7bd2e7bc419042bca990a04b7680b7a
4
+ data.tar.gz: 0a029a7275a7eba0e201457275f4490074ed92f1
5
5
  SHA512:
6
- metadata.gz: 7d7ac9a08e59b1698121a9aaf13b195a032961a3df092c7a58ed183611869efe95803928e5dce25fe8b8e9a0394a1eae7e15cb4b2fa4b7b44a0bee1362321bdb
7
- data.tar.gz: a97ecd3ea4a6d391b7b7e77d38956d9c7c8089ca5406513301a2e46e5f1e12fb82edd4f0a0dce048a473e903965012246c8b99978fb207eae384fb35a4887238
6
+ metadata.gz: 873f0c289ed656c300e0e2df2efee4cdb8f10efc7b6f5fd558715fc02ce02327d39be37434582c2704d2379a02d8c50b221cf8434a1025ee85e6a507b0f73629
7
+ data.tar.gz: 04a9a3a18264487cfda5328fecdb01737dcb5dac27b2c08e6db2f5de17ba56cbee1d3cb81739850cccf4142de5f5d2d7c9c9e65a593c70254d6833a155cb5786
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 4.1.1
2
+
3
+ - Fix bug where setting credentials would cause fatal errors. See https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/441
4
+
1
5
  ## 4.1.0
2
6
  - breaking,config: Removed obsolete config `host` and `port`. Please use the `hosts` config with the `[host:port]` syntax.
3
7
  - breaking,config: Removed obsolete config `index_type`. Please use `document_type` instead.
@@ -90,9 +90,10 @@ module LogStash; module Outputs; class ElasticSearch;
90
90
  adapter_options = {
91
91
  :socket_timeout => timeout,
92
92
  :request_timeout => timeout,
93
- :proxy => client_settings[:proxy]
94
93
  }
95
94
 
95
+ adapter_options[:proxy] = client_settings[:proxy] if client_settings[:proxy]
96
+
96
97
  # Having this explicitly set to nil is an error
97
98
  if client_settings[:pool_max]
98
99
  adapter_options[:pool_max] = client_settings[:pool_max]
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-elasticsearch'
4
- s.version = '4.1.0'
4
+ s.version = '4.1.1'
5
5
  s.licenses = ['apache-2.0']
6
6
  s.summary = "Logstash Output to Elasticsearch"
7
7
  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"
@@ -42,6 +42,16 @@ describe "Proxy option" do
42
42
  end
43
43
  end
44
44
  end
45
+
46
+ context "when not specified" do
47
+ let(:proxy) { nil }
48
+
49
+ it "should not send the proxy option to manticore" do
50
+ expect(::Manticore::Client).to have_received(:new) do |options|
51
+ expect(options).not_to include(:proxy)
52
+ end
53
+ end
54
+ end
45
55
  end
46
56
 
47
57
  describe "invalid configs" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-elasticsearch
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0
4
+ version: 4.1.1
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-21 00:00:00.000000000 Z
11
+ date: 2016-06-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement