logstash-core 6.4.0-java → 6.4.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e766866b8e8de1c59212aab21120296be4a2b3768e736e9fc7fae7851d6687
-  data.tar.gz: 6c9f88892074eaa5c909df9365f94e58e5ec6781c559268b72fdc3c47f59be57
+  metadata.gz: 8145b2303fc0c15e198142a1201d06e4462fed9cf1d32b0048c931007e139fe3
+  data.tar.gz: 60f764737970347eea41598ff33a2829af597f4a6b2b5efe2597d9b60272a95d
 SHA512:
-  metadata.gz: 3dc2bdc1806597be02fd49c75f7c2060543b5decbbb6c5657d680798d2092cabce49044fe8d08490a0ee37f507f4ff5bed5c71b21e72790a81b99e143a58c52d
-  data.tar.gz: 482cbc47fc99ff43101b28bf0f6fff6488fe1faeeea717a1934afd8dde672d4efd523a7f56749bc4f3822628029ac39b525f66e9d0a6c1207e7cc5292793effb
+  metadata.gz: 430c9647d501ce1f1afa84b86f0cb81a8159627a026427c7eb9783f3474cd26a1cab8dcc52cd6da048c42f8e16b63cbdc24cff7dbd98dd94fc5898fa32952add
+  data.tar.gz: f67eb745c785e6d8fe2ae666602c754222100ada5e4408f39bd03af4665a1b64f6a1e5cc178919d673289fe4c2fa366cc76aebeb6da711c617083822d1324eb0

data/lib/logstash/elasticsearch_client.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "elasticsearch"
 require "elasticsearch/transport/transport/http/manticore"
+require 'logstash/util/manticore_ssl_config_helper'
 
 module LogStash class ElasticsearchClient
   include LogStash::Util::Loggable
@@ -20,21 +21,14 @@ module LogStash class ElasticsearchClient
   end
 
   class RubyClient
+    include LogStash::Util::ManticoreSSLConfigHelper
+
     def initialize(settings, logger)
       @settings = settings
       @logger = logger
       @client_args = client_args
 
-      ssl_options = {}
-
-      # boolean settings may be strings if set through the cli
-      # or booleans if set through the yaml file, so we use .to_s
-      if @settings["var.elasticsearch.ssl.enabled"].to_s == "true"
-        ssl_options[:verify] = @settings.fetch("var.elasticsearch.ssl.verification_mode", true)
-        ssl_options[:ca_file] = @settings.fetch("var.elasticsearch.ssl.certificate_authority", nil)
-        ssl_options[:client_cert] = @settings.fetch("var.elasticsearch.ssl.certificate", nil)
-        ssl_options[:client_key] = @settings.fetch("var.elasticsearch.ssl.key", nil)
-      end
+      ssl_options = manticore_ssl_options_from_config('elasticsearch', settings)
 
       @client_args[:ssl] = ssl_options
 

data/lib/logstash/java_pipeline.rb

@@ -22,6 +22,8 @@ module LogStash; class JavaPipeline < JavaBasePipeline
   def initialize(pipeline_config, namespaced_metric = nil, agent = nil)
     @logger = self.logger
     super pipeline_config, namespaced_metric, @logger, agent
+    open_queue
+
     @worker_threads = []
 
     @drain_queue =  settings.get_value("queue.drain") || settings.get("queue.type") == "memory"
@@ -218,7 +220,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
               lir_execution, filter_queue_client, @events_filtered, @events_consumed,
               @flushRequested, @flushing, @shutdownRequested, @drain_queue).run
         end
-        thread.name="[#{pipeline_id}]>worker#{t}"
+        Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
         @worker_threads << thread
       end
 

data/lib/logstash/modules/kibana_client.rb

@@ -1,10 +1,13 @@
 # encoding: utf-8
 require "logstash/json"
 require "manticore"
+require 'logstash/util/manticore_ssl_config_helper'
 
 module LogStash module Modules class KibanaClient
   include LogStash::Util::Loggable
 
+  include LogStash::Util::ManticoreSSLConfigHelper
+
   class Response
     # to create a custom response with body as an Object (Hash or Array)
     attr_reader :status, :body, :headers
@@ -37,17 +40,8 @@ module LogStash module Modules class KibanaClient
       pool_max_per_route: 2
     }
 
-    ssl_options = {}
-
-    # boolean settings may be strings if set through the cli
-    # or booleans if set through the yaml file, so we use .to_s
-    ssl_enabled = @settings["var.kibana.ssl.enabled"].to_s == "true"
-    if ssl_enabled
-      ssl_options[:verify] = @settings.fetch("var.kibana.ssl.verification_mode", "strict").to_sym
-      ssl_options[:ca_file] = @settings.fetch("var.kibana.ssl.certificate_authority", nil)
-      ssl_options[:client_cert] = @settings.fetch("var.kibana.ssl.certificate", nil)
-      ssl_options[:client_key] = @settings.fetch("var.kibana.ssl.key", nil)
-    end
+    ssl_options = manticore_ssl_options_from_config('kibana', settings)
+    ssl_enabled = ssl_options.any?
 
     client_options[:ssl] = ssl_options
 

data/lib/logstash/pipeline.rb

@@ -88,6 +88,7 @@ module LogStash; class Pipeline < BasePipeline
 
   def initialize(pipeline_config, namespaced_metric = nil, agent = nil)
     super
+    open_queue
 
     @worker_threads = []
 
@@ -284,7 +285,7 @@ module LogStash; class Pipeline < BasePipeline
         thread = Thread.new(batch_size, batch_delay, self) do |_b_size, _b_delay, _pipeline|
           _pipeline.worker_loop(_b_size, _b_delay)
         end
-        thread.name="[#{pipeline_id}]>worker#{t}"
+        Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
         @worker_threads << thread
       end
 

data/lib/logstash/util/manticore_ssl_config_helper.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+
+module LogStash; module Util; module ManticoreSSLConfigHelper
+  extend self
+
+  ##
+  # Extract Manticore-style SSL directives from the given configuration.
+  #
+  # @param namespace [String] a string namespace (e.g., `kibana` in `var.kibana.ssl.*`)
+  # @param settings [Hash<String,Object>] a collection of Manticore-friendly SSL directives.
+  #                                       if SSL explicitly disabled, an _empty_ hash will be returned.
+  #
+  # @return [Hash<Symbol,Object>]
+  def manticore_ssl_options_from_config(namespace, settings)
+    ssl_settings = strip_prefix(settings, "var.#{namespace}.ssl.")
+
+    # boolean settings may be strings if set through the cli
+    # or booleans if set through the yaml file, so we use .to_s
+    if ssl_settings.include?('enabled') && !coerce_boolean(ssl_settings['enabled'])
+      logger.warn('SSL explicitly disabled; other SSL settings will be ignored') if logger && ssl_settings.size > 1
+      return {}
+    end
+
+    {
+        :verify      => ssl_settings.fetch('verification_mode', :strict).to_sym,
+        :ca_file     => ssl_settings.fetch('certificate_authority', nil),
+        :client_cert => ssl_settings.fetch('certificate', nil),
+        :client_key  => ssl_settings.fetch('key', nil),
+    }
+  end
+
+  private
+
+  ##
+  # Returns the subset of the hash whose keys match the given prefix, with the prefix removed
+  #
+  # @param hash [Hash<String,Object>]
+  # @param prefix [String]
+  # @return [Hash<String,Object>]
+  def strip_prefix(hash, prefix)
+    hash.each_with_object({}) do |(key, value), memo|
+      next unless key.start_with?(prefix)
+      unprefixed_key = key[prefix.length..-1]
+      memo[unprefixed_key] = value
+    end
+  end
+
+  ##
+  # Coerces the non-nil input to boolean
+  #
+  # @param value [Boolean,String,Integer]
+  # @return [Boolean]
+  def coerce_boolean(value)
+    case value
+    when true, "true", "T", 1 then true
+    when false, "false", "F", 0 then false
+    else
+      fail("Boolean value required, received `#{value}`")
+    end
+  end
+
+  ##
+  # Adapter to enable logging via the including class' `#logger` method or `@logger` instance variable
+  #
+  # @return [Logger,nil]
+  def logger
+    return super if defined?(super)
+
+    @logger
+  end
+end end end

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.4.0
-logstash-core: 6.4.0
+logstash: 6.4.1
+logstash-core: 6.4.1
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -448,6 +448,7 @@ files:
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
 - lib/logstash/util/loggable.rb
+- lib/logstash/util/manticore_ssl_config_helper.rb
 - lib/logstash/util/modules_setting_array.rb
 - lib/logstash/util/password.rb
 - lib/logstash/util/plugin_version.rb