logstash-core 7.3.1-java → 7.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d263b8d4fecd83fd35aa6fcad205439982be93dbb88cfae5a5b400eea215d57
-  data.tar.gz: b8b4f33ed54f699b45f53d9f08f238bd06abaa6ef9fbe0c383443c65906985eb
+  metadata.gz: a9f056b670518c9c84a1080c87e4ada7f16729ceb93dc8fc4cbe62c71ef47e86
+  data.tar.gz: 8abadb91f916ae4e32ccc0dba9b7fb1ba0917948d7da3c5de97519dbf4f7dd1c
 SHA512:
-  metadata.gz: 9b680b1220b7a973f29cf9d999ace80da14311c2ceacfeee433c619bfc770007d87da83ce645cddb1d01b8154206b2df991fba5ece1a4c42d528c0e1ffbfd3c6
-  data.tar.gz: 39a7fc2346321781cc7385f04c4ca399735dbbda3d7285b57d30d1b3196b58220ecbcb0d90ecc685dc64cd1871ec2bd8d51e483ac36ea9065e40dc0aee0c3a76
+  metadata.gz: 3db1f0158ea7160a663d7f54ed9137ed52112ded806657393397eb35e69ecbb994d19dcf15e590823326e821737a723233441a16ed2234ab5c1e0aef6e9bde7d
+  data.tar.gz: 99861090b2d27b2c48a5f041147566e4c821027da0de42981b824645600ea267c2f63e5a6f04ccc6b415404e6e856dbed15075fd25d5b52a2c50caa813b8cff4

data/lib/logstash/api/commands/stats.rb

@@ -65,8 +65,8 @@ module LogStash
             service.agent,
             service.snapshot.metric_store,
             true).each_with_object({}) do |pipeline_stats, memo|
-              pipeline_id = pipeline_stats["id"].to_s
-              memo[pipeline_id] = pipeline_stats
+              p_id = pipeline_stats["id"].to_s
+              memo[p_id] = pipeline_stats
             end
 
           if pipeline_id.nil?

data/lib/logstash/config/source/multi_local.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "logstash/config/source/local"
-require "logstash/pipeline_settings"
+require "logstash/settings"
 
 module LogStash module Config module Source
   class MultiLocal < Local
@@ -15,7 +15,8 @@ module LogStash module Config module Source
     def pipeline_configs
       pipelines = retrieve_yaml_pipelines()
       pipelines_settings = pipelines.map do |pipeline_settings|
-        ::LogStash::PipelineSettings.from_settings(@original_settings.clone).merge(pipeline_settings)
+        clone = @original_settings.clone
+        clone.merge_pipeline_settings(pipeline_settings)
       end
       detect_duplicate_pipelines(pipelines_settings)
       pipeline_configs = pipelines_settings.map do |pipeline_settings|

data/lib/logstash/settings.rb

@@ -10,6 +10,39 @@ module LogStash
     include LogStash::Util::SubstitutionVariables
     include LogStash::Util::Loggable
 
+    # there are settings that the pipeline uses and can be changed per pipeline instance
+    PIPELINE_SETTINGS_WHITE_LIST = [
+      "config.debug",
+      "config.support_escapes",
+      "config.reload.automatic",
+      "config.reload.interval",
+      "config.string",
+      "dead_letter_queue.enable",
+      "dead_letter_queue.max_bytes",
+      "metric.collect",
+      "pipeline.java_execution",
+      "pipeline.plugin_classloaders",
+      "path.config",
+      "path.dead_letter_queue",
+      "path.queue",
+      "pipeline.batch.delay",
+      "pipeline.batch.size",
+      "pipeline.id",
+      "pipeline.reloadable",
+      "pipeline.system",
+      "pipeline.workers",
+      "queue.checkpoint.acks",
+      "queue.checkpoint.interval",
+      "queue.checkpoint.writes",
+      "queue.checkpoint.retry",
+      "queue.drain",
+      "queue.max_bytes",
+      "queue.max_events",
+      "queue.page_capacity",
+      "queue.type",
+    ]
+
+
     def initialize
       @settings = {}
       # Theses settings were loaded from the yaml file
@@ -89,6 +122,15 @@ module LogStash
       self
     end
 
+    def merge_pipeline_settings(hash, graceful = false)
+      hash.each do |key, _|
+        unless PIPELINE_SETTINGS_WHITE_LIST.include?(key)
+          raise ArgumentError.new("Only pipeline related settings are expected. Received \"#{key}\". Allowed settings: #{PIPELINE_SETTINGS_WHITE_LIST}")
+        end
+      end
+      merge(hash, graceful)
+    end
+
     def format_settings
       output = []
       output << "-------- Logstash Settings (* means modified) ---------"

data/spec/logstash/api/commands/stats_spec.rb

@@ -49,4 +49,41 @@ describe LogStash::Api::Commands::Stats do
     end
 
   end
+
+  describe "pipeline stats" do
+    let(:report_method) { :pipeline }
+    it "returns information on existing pipeline" do
+      expect(report.keys).to include(:main)
+    end
+    context "for each pipeline" do
+      it "returns information on pipeline" do
+        expect(report[:main].keys).to include(
+          :events,
+          :plugins,
+          :reloads,
+          :queue,
+        )
+      end
+      it "returns event information" do
+        expect(report[:main][:events].keys).to include(
+          :in,
+          :filtered,
+          :duration_in_millis,
+          :out,
+          :queue_push_duration_in_millis
+        )
+      end
+    end
+    context "when using multiple pipelines" do
+      before(:each) do
+        expect(LogStash::Config::PipelinesInfo).to receive(:format_pipelines_info).and_return([
+          {"id" => :main},
+          {"id" => :secondary},
+        ])
+      end
+      it "contains metrics for all pipelines" do
+        expect(report.keys).to include(:main, :secondary)
+      end
+    end
+  end
 end

data/spec/logstash/patches_spec.rb

@@ -36,9 +36,7 @@ describe "OpenSSL defaults" do
     # https://github.com/jordansissel/ruby-flores/blob/master/spec/flores/pki_integration_spec.rb
     # since these helpers were created to fix this particular issue
     let(:csr) { Flores::PKI::CertificateSigningRequest.new }
-    # Here, I use a 1024-bit key for faster tests.
-    # Please do not use such small keys in production.
-    let(:key_bits) { 1024 }
+    let(:key_bits) { 2048 }
     let(:key) { OpenSSL::PKey::RSA.generate(key_bits, 65537) }
     let(:certificate_duration) { Flores::Random.number(1..86400) }
 

data/spec/support/shared_contexts.rb

@@ -24,9 +24,12 @@ shared_context "api setup" do
     settings.set("config.reload.automatic", false)
     @agent = make_test_agent(settings)
     @agent.execute
+    @pipelines_registry = LogStash::PipelinesRegistry.new
     pipeline_config = mock_pipeline_config(:main, "input { generator { id => '123' } } output { null {} }")
     pipeline_creator =  LogStash::PipelineAction::Create.new(pipeline_config, @agent.metric)
-    @pipelines_registry = LogStash::PipelinesRegistry.new
+    expect(pipeline_creator.execute(@agent, @pipelines_registry)).to be_truthy
+    pipeline_config = mock_pipeline_config(:secondary, "input { generator { id => '123' } } output { null {} }")
+    pipeline_creator =  LogStash::PipelineAction::Create.new(pipeline_config, @agent.metric)
     expect(pipeline_creator.execute(@agent, @pipelines_registry)).to be_truthy
   end
 

data/versions-gem-copy.yml

@@ -1,7 +1,7 @@
 ---
 # alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
-logstash: 7.3.1
-logstash-core: 7.3.1
+logstash: 7.3.2
+logstash-core: 7.3.2
 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: 7.3.1
+  version: 7.3.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -414,7 +414,6 @@ files:
 - lib/logstash/pipeline_action/reload.rb
 - lib/logstash/pipeline_action/stop.rb
 - lib/logstash/pipeline_reporter.rb
-- lib/logstash/pipeline_settings.rb
 - lib/logstash/pipelines_registry.rb
 - lib/logstash/plugin.rb
 - lib/logstash/plugin_metadata.rb

data/lib/logstash/pipeline_settings.rb

@@ -1,55 +0,0 @@
-# encoding: utf-8
-require "logstash/settings"
-
-module LogStash
-  class PipelineSettings < Settings
-
-    # there are settings that the pipeline uses and can be changed per pipeline instance
-    SETTINGS_WHITE_LIST = [
-      "config.debug",
-      "config.support_escapes",
-      "config.reload.automatic",
-      "config.reload.interval",
-      "config.string",
-      "dead_letter_queue.enable",
-      "dead_letter_queue.max_bytes",
-      "metric.collect",
-      "pipeline.java_execution",
-      "pipeline.plugin_classloaders",
-      "path.config",
-      "path.dead_letter_queue",
-      "path.queue",
-      "pipeline.batch.delay",
-      "pipeline.batch.size",
-      "pipeline.id",
-      "pipeline.reloadable",
-      "pipeline.system",
-      "pipeline.workers",
-      "queue.checkpoint.acks",
-      "queue.checkpoint.interval",
-      "queue.checkpoint.writes",
-      "queue.checkpoint.retry",
-      "queue.drain",
-      "queue.max_bytes",
-      "queue.max_events",
-      "queue.page_capacity",
-      "queue.type",
-    ]
-
-    # register a set of settings that is used as the default set of pipelines settings
-    def self.from_settings(settings)
-      pipeline_settings = self.new
-      SETTINGS_WHITE_LIST.each do |setting|
-        pipeline_settings.register(settings.get_setting(setting).clone)
-      end
-      pipeline_settings
-    end
-
-    def register(setting)
-      unless SETTINGS_WHITE_LIST.include?(setting.name)
-        raise ArgumentError.new("Only pipeline related settings can be registered in a PipelineSettings object. Received \"#{setting.name}\". Allowed settings: #{SETTINGS_WHITE_LIST}")
-      end
-      super(setting)
-    end
-  end
-end