logstash-output-elasticsearch 6.2.6-java → 6.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e3482785093444d19b07aae664a7f4bdd9d8a8
-  data.tar.gz: 583f5fac5272e56c5aa7f11246d92b2fe521e352
+  metadata.gz: c643a65352466edd12cc72fd46dc55cb55b31abe
+  data.tar.gz: 4ee86089fd0a20e3ca27ff3434faa31408ed941d
 SHA512:
-  metadata.gz: da95653926bd5c8a3e83b06d9cdaa8f0682018338221959e1c42d02000fea0e2bb9c7f9b3de94053a8bee6c4de1fa9354d90eba355e4f6ffdd28dfcc59901755
-  data.tar.gz: 75fe257a8468a539dbc54e691b8de5f71930e2646107264d664f871d7289a49d745feccc9a465d875bdea7d0786386fc041442de6fc22133662859a05bbe5b85
+  metadata.gz: e3c9c26a775b61f24da553bed01dba155bdca35fea9513d13f5ca818ba49f49d2ce779ed53542d20ae3c6aa40814ccb6a1f82b583ff41b65338296d3bd9ec631
+  data.tar.gz: 5ab4e49ff1fd3b35d739c4e5e44c4a0e36ffd8ebe563fa9e235b03936e5015fc571171b97c9a610c6d3a7f4e696761ee829114f09d30bada34ffa90dc74eb3dd

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.3.0
+- Add support for customizing sniffing_path with absolute_sniffing_path
+
 ## 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

data/lib/logstash/outputs/elasticsearch.rb

@@ -188,6 +188,24 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   # * with `absolute_healthcheck_path: false`: "http://localhost:9200/health"
   config :absolute_healthcheck_path, :validate => :boolean, :default => false
 
+  # If sniffing is enabled, this plugin will periodically execute a request
+  # to one of the nodes to retrieve the list of other nodes eligible to receive
+  # bulk requests. By default this path is `_nodes/http` but if you need to set
+  # it to something else, this is the place
+  # NOTE: any query parameters present in the URL or query_params config option will be removed
+  config :sniffing_path, :validate => :string, :default => "_nodes/http"
+
+  # When a `sniffing_path` config is provided, this additional flag can be used to
+  # specify whether this sniffing_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 sniffing_path is "/_sniffing",
+  # the sniffing request will be sent to:
+  #
+  # * with `absolute_sniffing_path: true`: "http://localhost:9200/es/_sniffing"
+  # * with `absolute_sniffing_path: false`: "http://localhost:9200/_sniffing"
+  config :absolute_sniffing_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.rb

@@ -251,6 +251,8 @@ module LogStash; module Outputs; class ElasticSearch;
         :sniffer_delay => options[:sniffer_delay],
         :healthcheck_path => options[:healthcheck_path],
         :absolute_healthcheck_path => options[:absolute_healthcheck_path],
+        :sniffing_path => options[:sniffing_path],
+        :absolute_sniffing_path => options[:absolute_sniffing_path],
         :resurrect_delay => options[:resurrect_delay],
         :url_normalizer => self.method(:host_to_url)
       }

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

@@ -28,13 +28,15 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       end
     end
 
-    attr_reader :logger, :adapter, :sniffing, :sniffer_delay, :resurrect_delay, :healthcheck_path, :absolute_healthcheck_path
+    attr_reader :logger, :adapter, :sniffing, :sniffer_delay, :resurrect_delay, :healthcheck_path, :absolute_healthcheck_path, :sniffing_path, :absolute_sniffing_path
 
     ROOT_URI_PATH = '/'.freeze
 
     DEFAULT_OPTIONS = {
       :healthcheck_path => ROOT_URI_PATH,
       :absolute_healthcheck_path => false,
+      :sniffing_path => '_nodes/http',
+      :absolute_sniffing_path => false,
       :scheme => 'http',
       :resurrect_delay => 5,
       :sniffing => false,
@@ -51,6 +53,8 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       DEFAULT_OPTIONS.merge(options).tap do |merged|
         @healthcheck_path = merged[:healthcheck_path]
         @absolute_healthcheck_path = merged[:absolute_healthcheck_path]
+        @sniffing_path = merged[:sniffing_path]
+        @absolute_sniffing_path = merged[:absolute_sniffing_path]
         @resurrect_delay = merged[:resurrect_delay]
         @sniffing = merged[:sniffing]
         @sniffer_delay = merged[:sniffer_delay]
@@ -152,9 +156,17 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
     ES2_SNIFF_RE_URL  = /([^\/]*)?\/?([^:]*):([0-9]+)/
     # Sniffs and returns the results. Does not update internal URLs!
     def check_sniff
-      url, resp = perform_request(:get, '_nodes/http')
+      resp = nil
+      with_connection do |url|
+        sniffing_url = url.clone
+        sniffing_url.query = nil
+        if @absolute_sniffing_path
+          sniffing_url.path = ROOT_URI_PATH
+        end
+        resp = perform_request_to_url(sniffing_url, :get, @sniffing_path, {}, nil)
+      end
       parsed = LogStash::Json.load(resp.body)
-      
+
       nodes = parsed['nodes']
       if !nodes || nodes.empty?
         @logger.warn("Sniff returned no nodes! Will not update hosts.")

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

@@ -15,7 +15,9 @@ module LogStash; module Outputs; class ElasticSearch;
         :client_settings => client_settings,
         :resurrect_delay => params["resurrect_delay"],
         :healthcheck_path => params["healthcheck_path"],
-        :absolute_healthcheck_path => params["absolute_healthcheck_path"]
+        :absolute_healthcheck_path => params["absolute_healthcheck_path"],
+        :sniffing_path => params["sniffing_path"],
+        :absolute_sniffing_path => params["absolute_sniffing_path"]
       }
 
       if params["sniffing"]

data/logstash-output-elasticsearch.gemspec

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

@@ -102,6 +102,42 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
         expect(subject.sniffer_alive?).to eql(true)
       end
     end
+    describe "absolute_sniffing_path" do
+      let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200#{path}")] }
+      let(:path) { "/meh" }
+      let(:options) { super.merge(:absolute_sniffing_path => absolute_sniffing_path, :path => path, :sniffing_path => sniffing_path) }
+      let(:sniffing_path) { "/some/other/path" }
+      let(:absolute_sniffing_path) { false }
+      let(:response) { double("manticore_response") }
+
+      before(:each) { allow(response).to receive(:body).and_return("{}") }
+
+      context "when enabled" do
+        let(:absolute_sniffing_path) { true }
+        it "should use the sniffing_path as the absolute path" do
+          expect(subject).to receive(:perform_request_to_url) do |url, method, req_path, _, _|
+            expect(method).to eq(:get)
+            expect(req_path).to eq(sniffing_path)
+            expect(url.path).to eq("/")
+            response
+          end
+          subject.check_sniff
+        end
+      end
+
+      context "when disabled" do
+        let(:absolute_sniffing_path) { false }
+        it "should use the sniffing_path as a relative path" do
+          expect(subject).to receive(:perform_request_to_url) do |url, method, req_path, _, _|
+            expect(method).to eq(:get)
+            expect(req_path).to eq(sniffing_path)
+            expect(url.path).to eq(path)
+            response
+          end
+          subject.check_sniff
+        end
+      end
+    end
   end
 
   describe "closing" do

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 6.2.6
+  version: 6.3.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: stud
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-  name: stud
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -30,22 +28,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: cabin
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-  name: cabin
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core-plugin-api
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -53,10 +54,7 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -64,63 +62,74 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: ftw
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.42
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.42
-  name: ftw
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: addressable
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.42
-- !ruby/object:Gem::Dependency
+        version: 2.3.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
-  name: addressable
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: json
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: manticore
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,59 +138,50 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: manticore
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: flores
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: flores
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: elasticsearch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: elasticsearch
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 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
 email: info@elastic.co
 executables: []