fluent-plugin-elasticsearch 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0bb600b3e421042e95cae076b456cf28b83acd7260ed91aea30174e42da279
-  data.tar.gz: 29df2a1ade54adb459694ddccb5c9c04cee62e447a35580a08b45acc22b35244
+  metadata.gz: 35b11b6ba12d6bfa22a084db14fd4503d2f16769dc9db7d30d22dafa3dbad035
+  data.tar.gz: a0812a380eb81188fa705924ae51df7bbc773b0d565469f48540807bc323ec33
 SHA512:
-  metadata.gz: e6007507bc7a5417c4e319e6d6875c29b4f95d84ac6e56bc60c2a35add576df2bb3bbedf5930104a1fbf599cd93c88471693cbaac222ca847c1c0db6e04d90bb
-  data.tar.gz: b24a9ea5f7078d1268f234893fe50b5aafe0c98b65493c4ee1d1c4f7ceffc62c9aeb26a0d9fb5f6f16277766518c0f3879c22a084ad7eb3a1fb13dfe2b0c2245
+  metadata.gz: 942a5d5e57f7fa81697cdc13ad0024ab40df80d7a2a45a1108cd9acb1909ad87c5b0e4e220ce4df91d35949a12ae413fb0209c59d6f8ddb908beefa2c257799b
+  data.tar.gz: f4f4d3d3c1e0cb2800a31516052a5ca3aecd5ba0c451bcb3dcbf0e91d7e492bbf8da4caf4f1871d24e898276fb8758c76ae52813ade2ab6884bf061de73cff63

data/History.md

@@ -1,8 +1,9 @@
 ## Changelog [[tags]](https://github.com/uken/fluent-plugin-elasticsearch/tags)
 
 ### [Unreleased]
-- Log ES response errors (#230)
-- Use latest elasticsearch-ruby (#240)
+
+### 1.13.4
+- backport auth: Fix missing auth tokens after reloading connections (#397)
 
 ### 1.13.3
 - backport removing outdated generating hash id support module (#374)
@@ -59,6 +60,10 @@
 ### 1.9.4
 - Include 'Content-Type' header in `transport_options`
 
+### 1.9.3
+- Use latest elasticsearch-ruby (#240)
+- Log ES response errors (#230)
+
 ### 1.9.2
 - Fix elasticsearch_dynamic for v0.14 (#224)
 

data/README.md

@@ -90,19 +90,13 @@ This plugin creates Elasticsearch indices by merely writing to them. Consider us
 
 ```
 hosts host1:port1,host2:port2,host3:port3
-# or
-hosts https://customhost.com:443/path,https://username:password@host-failover.com:443
 ```
 
 You can specify multiple Elasticsearch hosts with separator ",".
 
 If you specify multiple hosts, this plugin will load balance updates to Elasticsearch. This is an [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby) feature, the default strategy is round-robin.
 
-And this plugin will escape required URL encoded characters within `%{}` placeholders.
-
-```
-hosts https://%{j+hn}:%{passw@rd}@host1:443/elastic/,http://host2
-```
+**Note:** Up until v1.13.3, it was allowed to embed the username/password in the URL. However, this syntax is deprecated as of v1.13.4 because it was found to cause serious connection problems (See #394). Please migrate your settings to use the `user` and `password` field (described below) instead.
 
 ### user, password, path, scheme, ssl_verify
 
@@ -115,7 +109,7 @@ path /elastic_search/
 scheme https
 ```
 
-You can specify user and password for HTTP basic auth. If used in conjunction with a hosts list, then these options will be used by default i.e. if you do not provide any of these options within the hosts listed.
+You can specify user and password for HTTP Basic authentication.
 
 And this plugin will escape required URL encoded characters within `%{}` placeholders.
 

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '1.13.3'
+  s.version       = '1.13.4'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -182,6 +182,10 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
                                                                               headers: { 'Content-Type' => 'application/json' },
                                                                               request: { timeout: @request_timeout },
                                                                               ssl: { verify: @ssl_verify, ca_file: @ca_file, version: @ssl_version }
+                                                                            },
+                                                                            http: {
+                                                                              user: @user,
+                                                                              password: @password
                                                                             }
                                                                           }), &adapter_conf)
       es = Elasticsearch::Client.new transport: transport

data/lib/fluent/plugin/out_elasticsearch_dynamic.rb

@@ -52,6 +52,10 @@ class Fluent::ElasticsearchOutputDynamic < Fluent::ElasticsearchOutput
                                                                               headers: { 'Content-Type' => 'application/json' },
                                                                               request: { timeout: @request_timeout },
                                                                               ssl: { verify: @ssl_verify, ca_file: @ca_file }
+                                                                            },
+                                                                            http: {
+                                                                              user: @user,
+                                                                              password: @password
                                                                             }
                                                                           }), &adapter_conf)
       es = Elasticsearch::Client.new transport: transport

data/test/plugin/test_out_elasticsearch.rb

@@ -580,8 +580,13 @@ class ElasticsearchOutput < Test::Unit::TestCase
   def test_content_type_header
     stub_request(:head, "http://localhost:9200/").
       to_return(:status => 200, :body => "", :headers => {})
-    elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-      with(headers: { "Content-Type" => "application/json" })
+    if Elasticsearch::VERSION >= "6.0.2"
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/x-ndjson" })
+    else
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/json" })
+    end
     driver.emit(sample_record)
     driver.run
     assert_requested(elastic_request)

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -210,8 +210,13 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
   def test_content_type_header
     stub_request(:head, "http://localhost:9200/").
       to_return(:status => 200, :body => "", :headers => {})
-    elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-      with(headers: { "Content-Type" => "application/json" })
+    if Elasticsearch::VERSION >= "6.0.2"
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/x-ndjson" })
+    else
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/json" })
+    end
     driver.emit(sample_record)
     driver.run
     assert_requested(elastic_request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Elasticsearch output plugin for Fluent event collector