logstash-core 5.6.3-java → 5.6.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef2dc1c5cc3cbee836c5250ca4c9d125ac18302
-  data.tar.gz: 710215041fb6cce31484f588d2d141de3d126caf
+  metadata.gz: df1559580d4898d9d5904c366fb99e6fdc01fe9a
+  data.tar.gz: 42b5968d158d63d05e85f1ffbf9f2e4dd20ad7c1
 SHA512:
-  metadata.gz: 5a5a8302cdb3e5a947eaa0888bb284b3f05011ac0d928420ec32b0ea3bff90721580d81c2896556647c2c21b354c14a31e68d2926f1ee0d6c186d0adb4954198
-  data.tar.gz: 36061c2b853e3a70b53a1bfb929597ab1d9f3f489596afe18972ea8d3f941446b5f92f63a92329a08fae2efb219fe9d53c6a49991040f7b25b7147851ba9ee76
+  metadata.gz: 4070075f61282df4c7114c52560848611838d5024e06360131cc77f40daa730ff6e91952b554749c347e9a05d46713fe04466171a750ff6700c2711f9ed5c075
+  data.tar.gz: cc68623a75280eebe05286a765b62ffc56afdc468f9d68d54443cdd8756c1ef73f777bf0415fd98d3fbf80e976dc710b693f85aeca0bba2067dbcea5e4c958c3

data/gemspec_jars.rb

@@ -2,6 +2,7 @@
 # runtime dependencies to generate this gemspec dependencies file to be eval'ed by the gemspec
 # for the jar-dependencies requirements.
 
+gem.requirements << "jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2"
 gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.6.2"
 gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.6.2"
 gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.1"

data/lib/logstash-core_jars.rb

@@ -5,7 +5,9 @@ rescue LoadError
   require 'org/apache/logging/log4j/log4j-core/2.6.2/log4j-core-2.6.2.jar'
   require 'com/fasterxml/jackson/core/jackson-databind/2.9.1/jackson-databind-2.9.1.jar'
   require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
+  require 'org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar'
   require 'com/fasterxml/jackson/core/jackson-annotations/2.9.1/jackson-annotations-2.9.1.jar'
+  require 'org/apache/logging/log4j/log4j-slf4j-impl/2.6.2/log4j-slf4j-impl-2.6.2.jar'
   require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.1/jackson-module-afterburner-2.9.1.jar'
   require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.9.1/jackson-dataformat-cbor-2.9.1.jar'
   require 'com/fasterxml/jackson/core/jackson-core/2.9.1/jackson-core-2.9.1.jar'
@@ -15,7 +17,9 @@ if defined? Jars
   require_jar( 'org.apache.logging.log4j', 'log4j-core', '2.6.2' )
   require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.1' )
   require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.6.2' )
+  require_jar( 'org.slf4j', 'slf4j-api', '1.7.21' )
   require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.1' )
+  require_jar( 'org.apache.logging.log4j', 'log4j-slf4j-impl', '2.6.2' )
   require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.1' )
   require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.1' )
   require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.9.1' )

data/lib/logstash/agent.rb

@@ -198,6 +198,16 @@ class LogStash::Agent
     end
   end
 
+  def get_running_user_defined_pipelines
+    found = @upgrade_mutex.synchronize do
+      @pipelines.select do |pipeline_id, _|
+        pipeline = @pipelines[pipeline_id]
+        pipeline.running? && !pipeline.system?
+      end
+    end
+    found
+  end
+
   def close_pipeline(id)
     pipeline = @pipelines[id]
     if pipeline

data/lib/logstash/config/config_ast.rb

@@ -142,7 +142,8 @@ module LogStash; module Config; module AST
         definitions << "define_singleton_method :#{type}_func do |event|"
         definitions << "  targeted_outputs = []" if type == "output"
         definitions << "  events = event" if type == "filter"
-        definitions << "  @logger.debug? && @logger.debug(\"#{type} received\", \"event\" => event.to_hash)"
+        definitions << "  @logger.debug? && @logger.debug(\"#{type} received\", \"event\" => event.to_hash)" if type == "output"
+        definitions << "  @logger.debug? && events.each { |e| @logger.debug(\"#{type} received\", \"event\" => e.to_hash)}" if type == "filter"
 
         sections.select { |s| s.plugin_type.text_value == type }.each do |s|
           definitions << s.compile.split("\n", -1).map { |e| "  #{e}" }

data/lib/logstash/instrument/periodic_poller/dlq.rb

@@ -10,10 +10,15 @@ module LogStash module Instrument module PeriodicPoller
     end
 
     def collect
-      _, pipeline = @agent.running_pipelines.first
-      unless pipeline.nil?
-        pipeline.collect_dlq_stats
+      pipelines = @agent.get_running_user_defined_pipelines
+      unless pipelines.nil?
+        pipelines.each {|_, pipeline|
+          unless pipeline.nil?
+            pipeline.collect_dlq_stats
+          end
+        }
       end
     end
   end
 end end end
+

data/lib/logstash/instrument/periodic_poller/pq.rb

@@ -11,9 +11,13 @@ module LogStash module Instrument module PeriodicPoller
     end
 
     def collect
-      pipeline_id, pipeline = @agent.running_pipelines.first
-      unless pipeline.nil?
-        pipeline.collect_stats
+      pipelines = @agent.get_running_user_defined_pipelines
+      unless pipelines.nil?
+        pipelines.each {|_, pipeline|
+          unless pipeline.nil?
+            pipeline.collect_stats
+          end
+        }
       end
     end
   end

data/spec/logstash/pipeline_spec.rb

@@ -228,6 +228,14 @@ describe LogStash::Pipeline do
           pipeline = TestPipeline.new(test_config_with_filters, pipeline_settings_obj)
           pipeline.close
         end
+
+        it "should log each filtered event if config.debug is set to true" do
+          pipeline_settings_obj.set("config.debug", true)
+          pipeline = TestPipeline.new(test_config_with_filters, pipeline_settings_obj)
+          expect(logger).to receive(:debug).with(/filter received/, anything)
+          pipeline.filter_func([LogStash::Event.new])
+          pipeline.close
+        end
       end
 
       context "when there is no command line -w N set" do

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 5.6.3
-logstash-core: 5.6.3
+logstash: 5.6.4
+logstash-core: 5.6.4
 logstash-core-plugin-api: 2.1.12
 
 # Note: this file is copied to the root of logstash-core because its gemspec needs it when

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.6.3
+  version: 5.6.4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -594,6 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
+- jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2
 - jar org.apache.logging.log4j:log4j-api, 2.6.2
 - jar org.apache.logging.log4j:log4j-core, 2.6.2
 - jar com.fasterxml.jackson.core:jackson-core, 2.9.1