logstash-core 6.3.2-java → 6.4.0-java

data/lib/logstash/universal_plugin.rb

@@ -1,13 +1 @@
-# encoding: utf-8
-module LogStash
-  class UniversalPlugin
-    def initialize
-    end
-
-    def register_hooks(hookManager)
-    end
-
-    def additionals_settings(settings)
-    end
-  end
-end
+# Keeping this file for backwards compatibility with plugins that include it directly.

data/lib/logstash/util.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 require "logstash/environment"
 
 module LogStash::Util

data/lib/logstash/util/buftok.rb

@@ -1,139 +1 @@
-# encoding: utf-8
-# BufferedTokenizer - Statefully split input data by a specifiable token
-#
-# Authors:: Tony Arcieri, Martin Emde
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 by Tony Arcieri and Martin Emde
-# 
-# Distributed under the Ruby license (http://www.ruby-lang.org/en/LICENSE.txt)
-#
-#---------------------------------------------------------------------------
-#
-
-# (C)2006 Tony Arcieri, Martin Emde
-# Distributed under the Ruby license (http://www.ruby-lang.org/en/LICENSE.txt)
-
-# BufferedTokenizer takes a delimiter upon instantiation, or acts line-based
-# by default.  It allows input to be spoon-fed from some outside source which
-# receives arbitrary length datagrams which may-or-may-not contain the token
-# by which entities are delimited.
-#
-# Commonly used to parse lines out of incoming data:
-#
-#  module LineBufferedConnection
-#    def receive_data(data)
-#      (@buffer ||= BufferedTokenizer.new).extract(data).each do |line|
-#        receive_line(line)
-#      end
-#    end
-#  end
-
-module FileWatch; class BufferedTokenizer
-  # New BufferedTokenizers will operate on lines delimited by "\n" by default
-  # or allow you to specify any delimiter token you so choose, which will then
-  # be used by String#split to tokenize the input data
-  def initialize(delimiter = "\n", size_limit = nil)
-    # Store the specified delimiter
-    @delimiter = delimiter
-
-    # Store the specified size limitation
-    @size_limit = size_limit
-
-    # The input buffer is stored as an array.  This is by far the most efficient
-    # approach given language constraints (in C a linked list would be a more
-    # appropriate data structure).  Segments of input data are stored in a list
-    # which is only joined when a token is reached, substantially reducing the
-    # number of objects required for the operation.
-    @input = []
-
-    # Size of the input buffer
-    @input_size = 0
-  end
-
-  # Extract takes an arbitrary string of input data and returns an array of
-  # tokenized entities, provided there were any available to extract.  This
-  # makes for easy processing of datagrams using a pattern like:
-  #
-  #   tokenizer.extract(data).map { |entity| Decode(entity) }.each do ...
-  def extract(data)
-    # Extract token-delimited entities from the input string with the split command.
-    # There's a bit of craftiness here with the -1 parameter.  Normally split would
-    # behave no differently regardless of if the token lies at the very end of the 
-    # input buffer or not (i.e. a literal edge case)  Specifying -1 forces split to
-    # return "" in this case, meaning that the last entry in the list represents a
-    # new segment of data where the token has not been encountered
-    entities = data.split @delimiter, -1
-
-    # Check to see if the buffer has exceeded capacity, if we're imposing a limit
-    if @size_limit
-      raise 'input buffer full' if @input_size + entities.first.size > @size_limit
-      @input_size += entities.first.size
-    end
-    
-    # Move the first entry in the resulting array into the input buffer.  It represents
-    # the last segment of a token-delimited entity unless it's the only entry in the list.
-    @input << entities.shift
-
-    # If the resulting array from the split is empty, the token was not encountered
-    # (not even at the end of the buffer).  Since we've encountered no token-delimited
-    # entities this go-around, return an empty array.
-    return [] if entities.empty?
-
-    # At this point, we've hit a token, or potentially multiple tokens.  Now we can bring
-    # together all the data we've buffered from earlier calls without hitting a token,
-    # and add it to our list of discovered entities.
-    entities.unshift @input.join
-
-=begin
-    # Note added by FC, 10Jul07. This paragraph contains a regression. It breaks
-    # empty tokens. Think of the empty line that delimits an HTTP header. It will have
-    # two "\n" delimiters in a row, and this code mishandles the resulting empty token.
-    # It someone figures out how to fix the problem, we can re-enable this code branch.
-    # Multi-character token support.
-    # Split any tokens that were incomplete on the last iteration buf complete now.
-    entities.map! do |e|
-      e.split @delimiter, -1
-    end
-    # Flatten the resulting array.  This has the side effect of removing the empty
-    # entry at the end that was produced by passing -1 to split.  Add it again if
-    # necessary.
-    if (entities[-1] == [])
-      entities.flatten! << []
-    else
-      entities.flatten!
-    end
-=end
-
-    # Now that we've hit a token, joined the input buffer and added it to the entities
-    # list, we can go ahead and clear the input buffer.  All of the segments that were
-    # stored before the join can now be garbage collected.
-    @input.clear
-    
-    # The last entity in the list is not token delimited, however, thanks to the -1
-    # passed to split.  It represents the beginning of a new list of as-yet-untokenized  
-    # data, so we add it to the start of the list.
-    @input << entities.pop
-    
-    # Set the new input buffer size, provided we're keeping track
-    @input_size = @input.first.size if @size_limit
-
-    # Now we're left with the list of extracted token-delimited entities we wanted
-    # in the first place.  Hooray!
-    entities
-  end
-  
-  # Flush the contents of the input buffer, i.e. return the input buffer even though
-  # a token has not yet been encountered
-  def flush
-    buffer = @input.join
-    @input.clear
-    buffer
-  end
-
-  # Is the buffer empty?
-  def empty?
-    @input.empty?
-  end
-end; end
+# Keeping this file for backwards compatibility with plugins that include it directly.

data/lib/logstash/util/byte_value.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 
 module LogStash; module Util; module ByteValue
   module_function
@@ -23,7 +22,7 @@ module LogStash; module Util; module ByteValue
 
   def multiplier(text)
     case text
-      when /(?:k|kb)$/ 
+      when /(?:k|kb)$/
         KB
       when /(?:m|mb)$/
         MB
@@ -35,7 +34,7 @@ module LogStash; module Util; module ByteValue
         PB
       when /(?:b)$/
         B
-      else 
+      else
         raise ArgumentError, "Unknown bytes value '#{text}'"
     end
   end

data/lib/logstash/util/charset.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 require "logstash/util"
 
 class LogStash::Util::Charset

data/lib/logstash/util/cloud_setting_auth.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 require "logstash/util/password"
 
 module LogStash module Util class CloudSettingAuth

data/lib/logstash/util/cloud_setting_id.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 require "base64"
 
 module LogStash module Util class CloudSettingId
@@ -8,9 +7,12 @@ module LogStash module Util class CloudSettingId
     Base64.urlsafe_encode64(args.join("$"))
   end
   DOT_SEPARATOR = "."
-  CLOUD_PORT = ":443"
+  CLOUD_PORT = "443"
 
-  attr_reader :original, :decoded, :label, :elasticsearch_host, :elasticsearch_scheme, :kibana_host, :kibana_scheme
+  attr_reader :original, :decoded, :label
+  attr_reader :elasticsearch_host, :elasticsearch_scheme, :elasticsearch_port
+  attr_reader :kibana_host, :kibana_scheme, :kibana_port
+  attr_reader :other_identifiers
 
   # The constructor is expecting a 'cloud.id', a string in 2 variants.
   # 1 part example: 'dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy'
@@ -40,8 +42,8 @@ module LogStash module Util class CloudSettingId
 
     @decoded = @decoded.encode(Encoding::UTF_8, :invalid => :replace, :undef => :replace)
 
-    unless @decoded.count("$") == 2
-      raise ArgumentError.new("Cloud Id does not decode. You may need to enable Kibana in the Cloud UI. Received: \"#{@decoded}\".")
+    if @decoded.count("$") < 2
+      raise ArgumentError.new("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{@decoded}\".")
     end
 
     segments = @decoded.split("$")
@@ -49,20 +51,30 @@ module LogStash module Util class CloudSettingId
       raise ArgumentError.new("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{@decoded}\".")
     end
     cloud_base = segments.shift
-    cloud_host = "#{DOT_SEPARATOR}#{cloud_base}#{CLOUD_PORT}"
+    cloud_host = "#{DOT_SEPARATOR}#{cloud_base}"
+    cloud_host, cloud_port = cloud_host.split(":")
+    cloud_port ||= CLOUD_PORT
+
+    @elasticsearch_host, @kibana_host, *@other_identifiers = segments
+    @elasticsearch_host, @elasticsearch_port = @elasticsearch_host.split(":")
+    @kibana_host, @kibana_port = @kibana_host.split(":")
+    @elasticsearch_port ||= cloud_port
+    @kibana_port ||= cloud_port
+    @other_identifiers ||= []
 
-    @elasticsearch_host, @kibana_host = segments
     if @elasticsearch_host == "undefined"
       raise ArgumentError.new("Cloud Id, after decoding, elasticsearch segment is 'undefined', literally.")
     end
     @elasticsearch_scheme = "https"
     @elasticsearch_host.concat(cloud_host)
+    @elasticsearch_host.concat(":#{@elasticsearch_port}")
 
     if @kibana_host == "undefined"
       raise ArgumentError.new("Cloud Id, after decoding, the kibana segment is 'undefined', literally. You may need to enable Kibana in the Cloud UI.")
     end
     @kibana_scheme = "https"
     @kibana_host.concat(cloud_host)
+    @kibana_host.concat(":#{@kibana_port}")
   end
 
   def to_s
@@ -72,4 +84,4 @@ module LogStash module Util class CloudSettingId
   def inspect
     to_s
   end
-end end end
+end end end

data/lib/logstash/util/dead_letter_queue_manager.rb

@@ -1,61 +1,2 @@
-require 'logstash/environment'
-
-module LogStash; module Util
-  class PluginDeadLetterQueueWriter
-
-    attr_reader :plugin_id, :plugin_type, :inner_writer
-
-    def initialize(inner_writer, plugin_id, plugin_type)
-      @plugin_id = plugin_id
-      @plugin_type = plugin_type
-      @inner_writer = inner_writer
-    end
-
-    def write(logstash_event, reason)
-      if @inner_writer && @inner_writer.is_open
-        @inner_writer.writeEntry(logstash_event.to_java, @plugin_type, @plugin_id, reason)
-      end
-    end
-
-    def close
-      if @inner_writer && @inner_writer.is_open
-        @inner_writer.close
-      end
-    end
-  end
-
-  class DummyDeadLetterQueueWriter
-    # class uses to represent a writer when dead_letter_queue is disabled
-    def initialize
-    end
-
-    def write(logstash_event, reason)
-      # noop
-    end
-
-    def is_open
-      false
-    end
-
-    def close
-      # noop
-    end
-  end
-
-  class DeadLetterQueueFactory
-    java_import org.logstash.common.DeadLetterQueueFactory
-
-    def self.get(pipeline_id)
-      if LogStash::SETTINGS.get("dead_letter_queue.enable")
-        return DeadLetterQueueWriter.new(
-          DeadLetterQueueFactory.getWriter(pipeline_id, LogStash::SETTINGS.get("path.dead_letter_queue"), LogStash::SETTINGS.get('dead_letter_queue.max_bytes')))
-      else
-        return DeadLetterQueueWriter.new(nil)
-      end
-    end
-
-    def self.close(pipeline_id)
-      DeadLetterQueueFactory.close(pipeline_id)
-    end
-  end
-end end
+# The contents of this file have been ported to Java. It is included for for compatibility
+# with plugins that directly include it.

data/lib/logstash/util/decorators.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 require "logstash/util"
 
 module LogStash::Util

data/lib/logstash/util/loggable.rb

@@ -1,31 +1 @@
-# encoding: utf-8
-require "logstash/logging/logger"
-require "logstash/namespace"
-
-module LogStash module Util
-  module Loggable
-    def self.included(klass)
-
-      def klass.log4j_name
-        ruby_name = self.name || self.class.name || self.class.to_s
-        ruby_name.gsub('::', '.').downcase
-      end
-
-      def klass.logger
-        @logger ||= LogStash::Logging::Logger.new(log4j_name)
-      end
-
-      def klass.slow_logger(warn_threshold, info_threshold, debug_threshold, trace_threshold)
-        @slow_logger ||= LogStash::Logging::SlowLogger.new(log4j_name, warn_threshold, info_threshold, debug_threshold, trace_threshold)
-      end
-
-      def logger
-        self.class.logger
-      end
-
-      def slow_logger(warn_threshold, info_threshold, debug_threshold, trace_threshold)
-        self.class.slow_logger(warn_threshold, info_threshold, debug_threshold, trace_threshold)
-      end
-    end
-  end
-end; end
+# Keeping this file for backwards compatibility with plugins that include it directly.

data/lib/logstash/util/modules_setting_array.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require "logstash/namespace"
+require "forwardable"
 require "logstash/util/password"
 
 module LogStash module Util class ModulesSettingArray
@@ -25,4 +25,4 @@ module LogStash module Util class ModulesSettingArray
   def __class__
     LogStash::Util::ModulesSettingArray
   end
-end end end
+end end end

data/lib/logstash/util/password.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 
 # This class exists to quietly wrap a password string so that, when printed or
 # logged, you don't accidentally print the password itself.

data/lib/logstash/util/plugin_version.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'logstash/errors'
 require 'rubygems/version'
 require 'forwardable'
 

data/lib/logstash/util/safe_uri.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/namespace"
 require "logstash/util"
 require "forwardable"
 
@@ -8,14 +7,14 @@ require "forwardable"
 class LogStash::Util::SafeURI
   PASS_PLACEHOLDER = "xxxxxx".freeze
   HOSTNAME_PORT_REGEX=/\A(?<hostname>([A-Za-z0-9\.\-]+)|\[[0-9A-Fa-f\:]+\])(:(?<port>\d+))?\Z/
-  
+
   extend Forwardable
-  
-  
+
+
   attr_reader :uri
 
   public
-  def initialize(arg)    
+  def initialize(arg)
     @uri = case arg
            when String
              arg = "//#{arg}" if HOSTNAME_PORT_REGEX.match(arg)
@@ -39,7 +38,7 @@ class LogStash::Util::SafeURI
 
   def sanitized
     return uri unless password # nothing to sanitize here!
-    
+
     user_info = user ? "#{user}:#{PASS_PLACEHOLDER}" : nil
 
     make_uri(scheme, user_info, host, port, path, query, fragment)
@@ -64,7 +63,7 @@ class LogStash::Util::SafeURI
     new_query = query
     new_fragment = fragment
 
-    case field 
+    case field
     when :scheme
       new_scheme = value
     when :user
@@ -124,7 +123,7 @@ class LogStash::Util::SafeURI
     # In java this is an int
     uri.port < 1 ? nil : uri.port
   end
- 
+
   def port=(new_port)
     update(:port, new_port)
   end