logstash-output-elasticsearch 6.2.5-java → 6.2.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8d5f7fef1865846b84c49dfe25980784557041b
-  data.tar.gz: 9eb6fee0f2c819cd0a2f6abbb989d67d5d0f0724
+  metadata.gz: 61e3482785093444d19b07aae664a7f4bdd9d8a8
+  data.tar.gz: 583f5fac5272e56c5aa7f11246d92b2fe521e352
 SHA512:
-  metadata.gz: 53269eaa667f3e7d4c3f3ee21c1f6f33771cb7a046e00a502b7d78d44614078bcde802d104a95ea4af26128383285c0bd74e998e06c2fb40b155c578c9fb835c
-  data.tar.gz: 2d70eaacefd1a827aa56feaccdd77c2c010512fd1b7a646bcad2078b2491f2958f262ea470a36d5370eecc34704f61718fcf8e6c76ccf76f7714e329c5aed331
+  metadata.gz: da95653926bd5c8a3e83b06d9cdaa8f0682018338221959e1c42d02000fea0e2bb9c7f9b3de94053a8bee6c4de1fa9354d90eba355e4f6ffdd28dfcc59901755
+  data.tar.gz: 75fe257a8468a539dbc54e691b8de5f71930e2646107264d664f871d7289a49d745feccc9a465d875bdea7d0786386fc041442de6fc22133662859a05bbe5b85

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.2.6
+- Fixed: Change how the healthcheck_path is treated: either append it to any existing path (default) or replace any existing path
+  Also ensures that the healthcheck url contains no query parameters regarless of hosts urls contains them or query_params being set. #554
+
 ## 6.2.5
 - Send the Content-Type: application/json header that proper ES clients should send
 

data/lib/logstash/outputs/elasticsearch.rb

@@ -173,14 +173,21 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
 
   # When a backend is marked down a HEAD request will be sent to this path in the
   # background to see if it has come back again before it is once again eligible
-  # to service requests. If you have custom firewall rules you may need to change
-  # this
+  # to service requests. If you have custom firewall rules you may need to change this
+  # NOTE: any query parameters present in the URL or query_params config option will be removed
   config :healthcheck_path, :validate => :string, :default => "/"
-  # When a `healthcheck_path` config is provided, this additional flag can be used to 
-  # specify whether it is an absolute URI or a relative path. 
-  # If this flag is true, `healthcheck_path` is expected to be a fully formed URL 
-  # with any basic auth credentials provided in the URL itself.
+
+  # When a `healthcheck_path` config is provided, this additional flag can be used to
+  # specify whether the healthcheck_path is appended to the existing path (default)
+  # or is treated as the absolute URL path.
+  #
+  # For example, if hosts url is "http://localhost:9200/es" and healthcheck_path is "/health",
+  # the health check url will be:
+  #
+  # * with `absolute_healthcheck_path: true`: "http://localhost:9200/es/health"
+  # * with `absolute_healthcheck_path: false`: "http://localhost:9200/health"
   config :absolute_healthcheck_path, :validate => :boolean, :default => false
+
   # How frequently, in seconds, to wait between resurrection attempts.
   # Resurrection is the process by which backend endpoints marked 'down' are checked
   # to see if they have come back to life

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

@@ -231,10 +231,10 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       @state_mutex.synchronize { @url_info.select {|url,meta| meta[:state] != :alive } }.each do |url,meta|
         begin
           path = healthcheck_path
-          healthcheck_url = url
+          healthcheck_url = LogStash::Util::SafeURI.new(url.uri.clone)
+          healthcheck_url.query = nil
           if @absolute_healthcheck_path
-            healthcheck_url = ::LogStash::Util::SafeURI.new(healthcheck_path)
-            path = ROOT_URI_PATH
+            healthcheck_url.path = ROOT_URI_PATH
           end
           logger.info("Running health check to see if an Elasticsearch connection is working",
                         :healthcheck_url => healthcheck_url, :path => path)

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
-
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '6.2.5'
+  s.version         = '6.2.6'
   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/http_client/pool_spec.rb

@@ -44,22 +44,47 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
       sleep(subject.resurrect_delay + 1)
     end
 
-    describe "absolute_healthcheck_path" do
-      let(:options) { super.merge(:absolute_healthcheck_path => true, :healthcheck_path => "http://abc:xyz@localhost:9200")}
-      let(:pool) { described_class.new(logger, adapter, initial_urls, options) }
-
-      before do
-        pool.start
+    describe "healthcheck url handling" do
+      let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200#{path}")] }
+      let(:healthcheck_path) { "/some/other/path" }
+      let(:absolute_healthcheck_path) { false }
+      let(:path) { "/meh" }
+      let(:options) { super.merge(:absolute_healthcheck_path => absolute_healthcheck_path, :path => path, :healthcheck_path => healthcheck_path) }
+
+      context "when using query params in the initial url" do
+        let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200?q=s")] }
+        it "is removed from the healthcheck request" do
+          expect(adapter).to receive(:perform_request) do |url, method, req_path, _, _|
+            expect(method).to eq(:head)
+            expect(url.query).to be_nil
+          end
+          subject.healthcheck!
+        end
       end
 
-      after do
-        pool.close
-      end
+      describe "absolute_healthcheck_path" do
+        context "when enabled" do
+          let(:absolute_healthcheck_path) { true }
+          it "should use the healthcheck_path as the absolute path" do
+            expect(adapter).to receive(:perform_request) do |url, method, req_path, _, _|
+              expect(method).to eq(:head)
+              expect(req_path).to eq(healthcheck_path)
+              expect(url.path).to eq("/")
+            end
+            subject.healthcheck!
+          end
+        end
 
-      context "when enabled" do
-        it "should use the healthcheck_path as URL to do a health check" do
-          expect(adapter).to receive(:perform_request).with(::LogStash::Util::SafeURI.new(subject.healthcheck_path), :head, "/", {}, nil)
-          pool.healthcheck!
+        context "when disabled" do
+          let(:absolute_healthcheck_path) { false }
+          it "should use the healthcheck_path as a relative path" do
+            expect(adapter).to receive(:perform_request) do |url, method, req_path, _, _|
+              expect(method).to eq(:head)
+              expect(req_path).to eq(healthcheck_path)
+              expect(url.path).to eq(path)
+            end
+            subject.healthcheck!
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 6.2.5
+  version: 6.2.6
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement