logstash-core 5.2.0-java → 5.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50660404c5ec13b21a5dccc7fd62b0d282dea262
-  data.tar.gz: 5b5b44f759032fda3022a8d08f982cf35ef5179a
+  metadata.gz: c4df5ad1b48f429f25bc3f16f97973b531b3c5d6
+  data.tar.gz: 1a59f8132f4156de4cb846d05a417e2d44ba6164
 SHA512:
-  metadata.gz: 134ef54d0f7ef058c201420d997e702775bf4520e747a6c40ec76a6593597192a6448a537bad0e1df236214d636b469c6d95faa4894492cb05c23c826b0ce4e9
-  data.tar.gz: fa146b9c7ccd8891ed64dc892026313ff6356d87511613e23a270b8a30fa33a664a87d39b586b51b3e94961a3a18dd3640087746bdf965a5a603ff3bfd514b21
+  metadata.gz: 1487f73f2dba8861338bf93548c9b5dfac360fc2ecc26c6a776cffa0cec848426e1422dc9ae1178c7cdb2759fcf62be3d8f690419cbf9bce0a8b04f75ad06370
+  data.tar.gz: 24a249aca51af3100d5c533f5a0491480718ad145b806f148ea36e366e05a35378366aa2819d98bb5c6f2a7dda0f0446103a04d33a27d6ac47d4296741ab2c90

data/lib/logstash-core/version.rb

@@ -5,4 +5,4 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 
-LOGSTASH_CORE_VERSION = "5.2.0"
+LOGSTASH_CORE_VERSION = "5.2.1"

data/lib/logstash/plugin.rb

@@ -19,18 +19,20 @@ class LogStash::Plugin
   # for a specific plugin.
   config :enable_metric, :validate => :boolean, :default => true
 
-  # Add a unique `ID` to the plugin instance, this `ID` is used for tracking
-  # information for a specific configuration of the plugin.
+  # Add a unique `ID` to the plugin configuration. If no ID is specified, Logstash will generate one. 
+  # It is strongly recommended to set this ID in your configuration. This is particulary useful 
+  # when you have two or more plugins of the same type, for example, if you have 2 grok filters. 
+  # Adding a named ID in this case will help in monitoring Logstash when using the monitoring APIs.
   #
-  # ```
+  # [source,ruby]
+  # ---------------------------------------------------------------------------------------------------
   # output {
   #  stdout {
-  #    id => "ABC"
+  #    id => "my_plugin_id"
   #  }
   # }
-  # ```
+  # ---------------------------------------------------------------------------------------------------
   #
-  # If you don't explicitely set this variable Logstash will generate a unique name.
   config :id, :validate => :string
 
   def hash

data/lib/logstash/settings.rb

@@ -489,6 +489,32 @@ module LogStash
         Util::TimeValue.from_value(value).to_nanos
       end
     end
+
+    class ArrayCoercible < Coercible
+      def initialize(name, klass, default, strict=true, &validator_proc)
+        @element_class = klass
+        super(name, ::Array, default, strict, &validator_proc)
+      end
+
+      def coerce(value)
+        Array(value)
+      end
+
+      protected
+      def validate(input)
+        if !input.is_a?(@klass)
+          raise ArgumentError.new("Setting \"#{@name}\" must be a #{@klass}. Received: #{input} (#{input.class})")
+        end
+
+        unless input.all? {|el| el.kind_of?(@element_class) }
+          raise ArgumentError.new("Values of setting \"#{@name}\" must be #{@element_class}. Received: #{input.map(&:class)}")
+        end
+
+        if @validator_proc && !@validator_proc.call(input)
+          raise ArgumentError.new("Failed to validate setting \"#{@name}\" with value: #{input}")
+        end
+      end
+    end
   end
 
 

data/lib/logstash/shutdown_watcher.rb

@@ -44,7 +44,7 @@ module LogStash
         @reports << pipeline_report_snapshot
         @reports.delete_at(0) if @reports.size > @report_every # expire old report
         if cycle_number == (@report_every - 1) # it's report time!
-          logger.warn(@reports.last)
+          logger.warn(@reports.last.to_s)
 
           if shutdown_stalled?
             logger.error("The shutdown process appears to be stalled due to busy or blocked plugins. Check the logs for more information.") if stalled_count == 0

data/lib/logstash/util/safe_uri.rb

@@ -47,5 +47,10 @@ class LogStash::Util::SafeURI
   def ==(other)
     other.is_a?(::LogStash::Util::SafeURI) ? @uri == other.uri : false
   end
+
+  def clone
+    cloned_uri = uri.clone
+    self.class.new(cloned_uri)
+  end
 end
 

data/lib/logstash/version.rb

@@ -11,4 +11,4 @@
 #       eventually this file should be in the root logstash lib fir and dependencies in logstash-core should be
 #       fixed.
 
-LOGSTASH_VERSION = "5.2.0"
+LOGSTASH_VERSION = "5.2.1"

data/spec/logstash/settings/array_coercible_spec.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/settings"
+
+describe LogStash::Setting::ArrayCoercible do
+  subject { described_class.new("option", element_class, value) }
+  let(:value) { [ ] }
+  let(:element_class) { Object }
+
+  context "when given a non array value" do
+    let(:value) { "test" }
+    describe "the value" do
+      it "is converted to an array with that single element" do
+        expect(subject.value).to eq(["test"])
+      end
+    end
+  end
+
+  context "when given an array value" do
+    let(:value) { ["test"] }
+    describe "the value" do
+      it "is not modified" do
+        expect(subject.value).to eq(value)
+      end
+    end
+  end
+
+  describe "initialization" do
+    subject { described_class }
+    let(:element_class) { Fixnum }
+    context "when given values of incorrect element class" do
+      let(:value) { "test" }
+
+      it "will raise an exception" do
+        expect { described_class.new("option", element_class, value) }.to raise_error(ArgumentError)
+      end
+    end
+    context "when given values of correct element class" do
+      let(:value) { 1 }
+
+      it "will not raise an exception" do
+        expect { described_class.new("option", element_class, value) }.not_to raise_error
+      end
+    end
+  end
+end

data/spec/logstash/util/safe_uri_spec.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+require "logstash/util/safe_uri"
+require "spec_helper"
+
+module LogStash module Util
+  describe SafeURI do
+    describe "#clone" do
+      subject { LogStash::Util::SafeURI.new("http://localhost:9200/uri?q=s") }
+      it "allows modifying uri parameters" do
+        cloned_safe_uri = subject.clone
+        cloned_safe_uri.path = "/cloned"
+        cloned_safe_uri.query = "a=b"
+        expect(subject.path).to eq("/uri")
+        expect(subject.query).to eq("q=s")
+        expect(cloned_safe_uri.path).to eq("/cloned")
+        expect(cloned_safe_uri.query).to eq("a=b")
+      end
+    end
+  end
+end end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   name: logstash-core-event-java
   prerelease: false
   type: :runtime
@@ -23,13 +23,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   name: logstash-core-queue-jruby
   prerelease: false
   type: :runtime
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -484,6 +484,7 @@ files:
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
 - spec/logstash/setting_spec.rb
+- spec/logstash/settings/array_coercible_spec.rb
 - spec/logstash/settings/bytes_spec.rb
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
@@ -499,6 +500,7 @@ files:
 - spec/logstash/util/duration_formatter_spec.rb
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb
+- spec/logstash/util/safe_uri_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
@@ -588,6 +590,7 @@ test_files:
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
 - spec/logstash/setting_spec.rb
+- spec/logstash/settings/array_coercible_spec.rb
 - spec/logstash/settings/bytes_spec.rb
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
@@ -603,6 +606,7 @@ test_files:
 - spec/logstash/util/duration_formatter_spec.rb
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb
+- spec/logstash/util/safe_uri_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb