logstash-core 5.5.3-java → 5.6.0-java

data/spec/logstash/output_delegator_spec.rb

@@ -4,10 +4,19 @@ require "logstash/execution_context"
 require "spec_helper"
 
 describe LogStash::OutputDelegator do
+
+  class MockGauge
+    def increment(_)
+    end
+  end
+
   let(:logger) { double("logger") }
   let(:events) { 7.times.map { LogStash::Event.new }}
   let(:plugin_args) { {"id" => "foo", "arg1" => "val1"} }
   let(:collector) { [] }
+  let(:counter_in) { MockGauge.new }
+  let(:counter_out) { MockGauge.new }
+  let(:counter_time) { MockGauge.new }
   let(:metric) { LogStash::Instrument::NamespacedNullMetric.new(collector, :null) }
   let(:default_execution_context) { LogStash::ExecutionContext.new(:main, "foo", "output",
                                                                    LogStash::Util::DummyDeadLetterQueueWriter.new) }
@@ -22,6 +31,9 @@ describe LogStash::OutputDelegator do
     before(:each) do
       # use the same metric instance
       allow(metric).to receive(:namespace).with(any_args).and_return(metric)
+      allow(metric).to receive(:counter).with(:in).and_return(counter_in)
+      allow(metric).to receive(:counter).with(:out).and_return(counter_out)
+      allow(metric).to receive(:counter).with(:duration_in_millis).and_return(counter_time)
 
       allow(out_klass).to receive(:new).with(any_args).and_return(out_inst)
       allow(out_klass).to receive(:name).and_return("example")
@@ -57,15 +69,13 @@ describe LogStash::OutputDelegator do
       end
 
       it "should increment the number of events received" do
-        expect(subject.metric_events).to receive(:increment).with(:in, events.length)
-        expect(subject.metric_events).to receive(:increment).with(:out, events.length)
+        expect(counter_in).to receive(:increment).with(events.length)
+        expect(counter_out).to receive(:increment).with(events.length)
         subject.multi_receive(events)
       end
 
       it "should record the `duration_in_millis`" do
-        clock = spy("clock")
-        expect(subject.metric_events).to receive(:time).with(:duration_in_millis).and_return(clock)
-        expect(clock).to receive(:stop)
+        expect(counter_time).to receive(:increment).with(Integer)
         subject.multi_receive(events)
       end
     end

data/spec/logstash/pipeline_spec.rb

@@ -4,6 +4,8 @@ require "logstash/inputs/generator"
 require "logstash/filters/multiline"
 require_relative "../support/mocks_classes"
 require_relative "../logstash/pipeline_reporter_spec" # for DummyOutput class
+require "stud/try"
+require 'timeout'
 
 class DummyInput < LogStash::Inputs::Base
   config_name "dummyinput"
@@ -103,20 +105,24 @@ describe LogStash::Pipeline do
   let(:worker_thread_count)     { 5 }
   let(:safe_thread_count)       { 1 }
   let(:override_thread_count)   { 42 }
-  let(:pipeline_settings_obj) { LogStash::SETTINGS }
+  let(:dead_letter_queue_enabled) { false }
+  let(:dead_letter_queue_path) { }
+  let(:pipeline_settings_obj) { LogStash::SETTINGS.clone }
   let(:pipeline_settings) { {} }
+  let(:max_retry) {10} #times
+  let(:timeout) {120} #seconds
 
   before :each do
     pipeline_workers_setting = LogStash::SETTINGS.get_setting("pipeline.workers")
     allow(pipeline_workers_setting).to receive(:default).and_return(worker_thread_count)
-    pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
-  end
+    dlq_enabled_setting = LogStash::SETTINGS.get_setting("dead_letter_queue.enable")
+    allow(dlq_enabled_setting).to receive(:value).and_return(dead_letter_queue_enabled)
+    dlq_path_setting = LogStash::SETTINGS.get_setting("path.dead_letter_queue")
+    allow(dlq_path_setting).to receive(:value).and_return(dead_letter_queue_path)
 
-  after :each do
-    pipeline_settings_obj.reset
+    pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
   end
 
-
   describe "event cancellation" do
     # test harness for https://github.com/elastic/logstash/issues/6055
 
@@ -155,12 +161,16 @@ describe LogStash::Pipeline do
 
       pipeline = LogStash::Pipeline.new(config, pipeline_settings_obj)
       t = Thread.new { pipeline.run }
-      sleep(0.1) until pipeline.ready?
-      wait(3).for do
-        # give us a bit of time to flush the events
-        # puts("*****" + output.events.map{|e| e.message}.to_s)
-        output.events.map{|e| e.get("message")}.include?("END")
-      end.to be_truthy
+      Timeout.timeout(timeout) do
+        sleep(0.1) until pipeline.ready?
+      end
+      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+        wait(3).for do
+          # give us a bit of time to flush the events
+          # puts("*****" + output.events.map{|e| e.message}.to_s)
+          output.events.map{|e| e.get("message")}.include?("END")
+        end.to be_truthy
+      end
       expect(output.events.size).to eq(2)
       expect(output.events[0].get("tags")).to eq(["notdropped"])
       expect(output.events[1].get("tags")).to eq(["notdropped"])
@@ -409,7 +419,9 @@ describe LogStash::Pipeline do
       # race condition if called in the thread
       p = pipeline
       t = Thread.new { p.run }
-      sleep(0.1) until pipeline.ready?
+      Timeout.timeout(timeout) do
+        sleep(0.1) until pipeline.ready?
+      end
       pipeline.shutdown
       t.join
     end
@@ -608,11 +620,15 @@ describe LogStash::Pipeline do
 
       pipeline = LogStash::Pipeline.new(config, pipeline_settings_obj)
       t = Thread.new { pipeline.run }
-      sleep(0.1) until pipeline.ready?
-      wait(10).for do
-        # give us a bit of time to flush the events
-        output.events.empty?
-      end.to be_falsey
+      Timeout.timeout(timeout) do
+        sleep(0.1) until pipeline.ready?
+      end
+      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+        wait(10).for do
+          # give us a bit of time to flush the events
+          output.events.empty?
+        end.to be_falsey
+      end
 
       expect(output.events.any? {|e| e.get("message") == "dummy_flush"}).to eq(true)
 
@@ -712,9 +728,12 @@ describe LogStash::Pipeline do
         # subject must be first call outside the thread context because of lazy initialization
         s = subject
         t = Thread.new { s.run }
-        sleep(0.1) until subject.ready?
-
-        sleep(0.1)
+        Timeout.timeout(timeout) do
+          sleep(0.1) until subject.ready?
+        end
+        Timeout.timeout(timeout) do
+          sleep(0.1)
+        end
         expect(subject.uptime).to be > 0
         subject.shutdown
         t.join
@@ -778,13 +797,17 @@ describe LogStash::Pipeline do
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
 
       pipeline_thread
-      sleep(0.1) until subject.ready?
+      Timeout.timeout(timeout) do
+        sleep(0.1) until subject.ready?
+      end
 
       # make sure we have received all the generated events
-      wait(3).for do
-        # give us a bit of time to flush the events
-        dummyoutput.events.size >= number_of_events
-      end.to be_truthy
+      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+        wait(3).for do
+          # give us a bit of time to flush the events
+          dummyoutput.events.size >= number_of_events
+        end.to be_truthy
+      end
     end
 
     after :each do
@@ -841,6 +864,33 @@ describe LogStash::Pipeline do
           expect(collected_metric[:stats][:pipelines][:main][:plugins][:filters][plugin_name][:name].value).to eq(LogStash::Filters::Multiline.config_name)
         end
       end
+
+      context 'when dlq is disabled' do
+        let (:collect_stats) { subject.collect_dlq_stats}
+        let (:collected_stats) { collected_metric[:stats][:pipelines][:main][:dlq]}
+        let (:available_stats) {[:path, :queue_size_in_bytes]}
+
+        it 'should show not show any dlq stats' do
+          collect_stats
+          expect(collected_stats).to be_nil
+        end
+
+      end
+
+      context 'when dlq is enabled' do
+        let (:dead_letter_queue_enabled) { true }
+        let (:dead_letter_queue_path) { Stud::Temporary.directory }
+        let (:pipeline_dlq_path) { "#{dead_letter_queue_path}/#{pipeline_id}"}
+
+        let (:collect_stats) { subject.collect_dlq_stats }
+        let (:collected_stats) { collected_metric[:stats][:pipelines][:main][:dlq]}
+
+        it 'should show dlq stats' do
+          collect_stats
+          # A newly created dead letter queue with no entries will have a size of 1 (the version 'header')
+          expect(collected_stats[:queue_size_in_bytes].value).to eq(1)
+        end
+      end
     end
   end
 

data/spec/logstash/runner_spec.rb

@@ -7,6 +7,7 @@ require "stud/temporary"
 require "logstash/util/java_version"
 require "logstash/logging/json"
 require "logstash/config/modules_common"
+require "logstash/modules/util"
 require "logstash/elasticsearch_client"
 require "json"
 require_relative "../support/helpers"
@@ -20,6 +21,7 @@ describe LogStash::Runner do
 
   subject { LogStash::Runner }
   let(:logger) { double("logger") }
+  let(:agent) { double("agent") }
 
   before :each do
     allow(LogStash::Runner).to receive(:logger).and_return(logger)
@@ -34,6 +36,13 @@ describe LogStash::Runner do
     allow(LogStash::Logging::Logger).to receive(:configure_logging) do |level, path|
       allow(logger).to receive(:level).and_return(level.to_sym)
     end
+    allow(LogStash::Logging::Logger).to receive(:reconfigure).with(any_args)
+    # Make sure we don't start a real pipeline here.
+    # because we cannot easily close the pipeline
+    allow(LogStash::Agent).to receive(:new).with(any_args).and_return(agent)
+    allow(agent).to receive(:execute)
+    allow(agent).to receive(:shutdown)
+    allow(agent).to receive(:register_pipeline)
   end
 
   describe "argument precedence" do
@@ -297,6 +306,9 @@ describe LogStash::Runner do
     end
 
     describe "config.debug" do
+      after(:each) do
+        LogStash::SETTINGS.set("config.debug", false)
+      end
       it "should set 'config.debug' to false by default" do
         expect(LogStash::Agent).to receive(:new) do |settings|
           expect(settings.get("config.debug")).to eq(false)
@@ -316,14 +328,18 @@ describe LogStash::Runner do
   end
 
   describe "logstash modules" do
+    before(:each) do
+      test_modules_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "modules_test_files"))
+      LogStash::Modules::Util.register_local_modules(test_modules_dir)
+    end
+
     describe "--config.test_and_exit" do
       subject { LogStash::Runner.new("") }
       let(:args) { ["-t", "--modules", module_string] }
 
       context "with a good configuration" do
-        let(:module_string) { "cef" }
+        let(:module_string) { "tester" }
         it "should exit successfully" do
-          skip("Skipped until cef module is added back to the codebase as explained in #7455")
           expect(logger).not_to receive(:fatal)
           expect(subject.run(args)).to eq(0)
         end
@@ -339,53 +355,58 @@ describe LogStash::Runner do
     end
 
     describe "--modules" do
-      let(:args) { ["--modules", module_string] }
-      let(:agent_instance) { double("agent") }
+      let(:args) { ["--modules", module_string, "--setup"] }
+
       context "with an available module specified but no connection to elasticsearch" do
-        let(:module_string) { "cef" }
+        let(:module_string) { "tester" }
         before do
           expect(logger).to receive(:fatal) do |msg, hash|
             expect(msg).to eq("An unexpected error occurred!")
             expect(hash).to be_a_config_loading_error_hash(
-              /Failed to import module configurations to Elasticsearch. Module: cef/)
+              /Failed to import module configurations to Elasticsearch and\/or Kibana. Module: tester has/)
           end
         end
         it "should log fatally and return a bad exit code" do
-          skip("Skipped until cef module is added back to the codebase as explained in #7455")
           expect(subject.run("bin/logstash", args)).to eq(1)
         end
       end
 
       context "with an available module specified and a mocked connection to elasticsearch" do
-        let(:module_string) { "cef" }
-        let(:client) { double(:client) }
+        let(:module_string) { "tester" }
+        let(:kbn_version) { "5.6.0" }
+        let(:esclient) { double(:esclient) }
+        let(:kbnclient) { double(:kbnclient) }
         let(:response) { double(:response) }
         before do
           allow(response).to receive(:status).and_return(404)
-          allow(client).to receive(:head).and_return(response)
-          allow(client).to receive(:can_connect?).and_return(true)
-          allow(agent_instance).to receive(:register_pipeline)
-          allow(agent_instance).to receive(:execute)
-          allow(agent_instance).to receive(:shutdown)
-          allow(LogStash::ElasticsearchClient).to receive(:build).and_return(client)
-
-          expect(client).to receive(:put).at_least(15).times do |path, content|
+          allow(esclient).to receive(:head).and_return(response)
+          allow(esclient).to receive(:can_connect?).and_return(true)
+          allow(kbnclient).to receive(:version).and_return(kbn_version)
+          allow(kbnclient).to receive(:version_parts).and_return(kbn_version.split('.'))
+          allow(kbnclient).to receive(:can_connect?).and_return(true)
+          allow(LogStash::ElasticsearchClient).to receive(:build).and_return(esclient)
+          allow(LogStash::Modules::KibanaClient).to receive(:new).and_return(kbnclient)
+
+          expect(esclient).to receive(:put).once do |path, content|
             LogStash::ElasticsearchClient::Response.new(201, "", {})
           end
-          expect(LogStash::Agent).to receive(:new) do |settings|
+          expect(kbnclient).to receive(:post).twice do |path, content|
+            LogStash::Modules::KibanaClient::Response.new(201, "", {})
+          end
+
+          expect(LogStash::Agent).to receive(:new) do |settings, source_loader|
             pipelines = LogStash::Config::ModulesCommon.pipeline_configs(settings)
             expect(pipelines).not_to be_empty
-            cef_pipeline = pipelines.first
-            expect(cef_pipeline).to include("pipeline_id", "config_string")
-            expect(cef_pipeline["pipeline_id"]).to include('cef')
-            expect(cef_pipeline["config_string"]).to include('index => "cef-')
-            agent_instance
+            module_pipeline = pipelines.first
+            expect(module_pipeline).to include("pipeline_id", "config_string")
+            expect(module_pipeline["pipeline_id"]).to include('tester')
+            expect(module_pipeline["config_string"]).to include('index => "tester-')
+            agent
           end
           expect(logger).not_to receive(:fatal)
           expect(logger).not_to receive(:error)
         end
-        it "should not terminate logstash" do
-          skip("Skipped until cef module is added back to the codebase as explained in #7455")
+        xit "should not terminate logstash" do
           expect(subject.run("bin/logstash", args)).to be_nil
         end
       end

data/spec/logstash/settings/splittable_string_array_spec.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/settings"
+
+describe LogStash::Setting::SplittableStringArray do
+  let(:element_class) { String }
+  let(:default_value) { [] }
+
+  subject { described_class.new("testing", element_class, default_value) }
+
+  before do
+    subject.set(candidate)
+  end
+
+  context "when giving an array" do
+    let(:candidate) { ["hello,", "ninja"] }
+
+    it "returns the same elements" do
+      expect(subject.value).to match(candidate)
+    end
+  end
+
+  context "when given a string" do
+    context "with 1 element" do
+      let(:candidate) { "hello" }
+
+      it "returns 1 element" do
+        expect(subject.value).to match(["hello"])
+      end
+    end
+
+    context "with multiple element" do
+      let(:candidate) { "hello,ninja" }
+
+      it "returns an array of string" do
+        expect(subject.value).to match(["hello", "ninja"])
+      end
+    end
+  end
+
+  context "when defining a custom tokenizer" do
+    subject { described_class.new("testing", element_class, default_value, strict=true, ";") }
+
+    let(:candidate) { "hello;ninja" }
+
+    it "returns an array of string" do
+      expect(subject.value).to match(["hello", "ninja"])
+    end
+  end
+end
+

data/spec/logstash/util/wrapped_synchronous_queue_spec.rb

@@ -4,28 +4,6 @@ require "logstash/util/wrapped_synchronous_queue"
 require "logstash/instrument/collector"
 
 describe LogStash::Util::WrappedSynchronousQueue do
-  context "#offer" do
-    context "queue is blocked" do
-      it "fails and give feedback" do
-        expect(subject.offer("Bonjour", 2)).to be_falsey
-      end
-    end
-
-    context "queue is not blocked" do
-      before do
-        @consumer = Thread.new { loop { subject.take } }
-        sleep(0.1)
-      end
-
-      after do
-        @consumer.kill
-      end
-
-      it "inserts successfully" do
-        expect(subject.offer("Bonjour", 20)).to be_truthy
-      end
-    end
-  end
 
   describe "queue clients" do
     context "when requesting a write client" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.5.3
+  version: 5.6.0
 platform: java
 authors:
 - Elastic
@@ -371,6 +371,8 @@ files:
 - lib/logstash/config/loader.rb
 - lib/logstash/config/mixin.rb
 - lib/logstash/config/modules_common.rb
+- lib/logstash/config/source/modules.rb
+- lib/logstash/config/string_escape.rb
 - lib/logstash/elasticsearch_client.rb
 - lib/logstash/environment.rb
 - lib/logstash/errors.rb
@@ -395,6 +397,7 @@ files:
 - lib/logstash/instrument/null_metric.rb
 - lib/logstash/instrument/periodic_poller/base.rb
 - lib/logstash/instrument/periodic_poller/cgroup.rb
+- lib/logstash/instrument/periodic_poller/dlq.rb
 - lib/logstash/instrument/periodic_poller/jvm.rb
 - lib/logstash/instrument/periodic_poller/load_average.rb
 - lib/logstash/instrument/periodic_poller/os.rb
@@ -409,15 +412,21 @@ files:
 - lib/logstash/logging/logger.rb
 - lib/logstash/modules/cli_parser.rb
 - lib/logstash/modules/elasticsearch_config.rb
+- lib/logstash/modules/elasticsearch_importer.rb
 - lib/logstash/modules/elasticsearch_resource.rb
 - lib/logstash/modules/file_reader.rb
-- lib/logstash/modules/importer.rb
-- lib/logstash/modules/kibana_base_resource.rb
+- lib/logstash/modules/kibana_base.rb
+- lib/logstash/modules/kibana_client.rb
 - lib/logstash/modules/kibana_config.rb
+- lib/logstash/modules/kibana_dashboards.rb
+- lib/logstash/modules/kibana_importer.rb
 - lib/logstash/modules/kibana_resource.rb
+- lib/logstash/modules/kibana_settings.rb
 - lib/logstash/modules/logstash_config.rb
 - lib/logstash/modules/resource_base.rb
 - lib/logstash/modules/scaffold.rb
+- lib/logstash/modules/settings_merger.rb
+- lib/logstash/modules/util.rb
 - lib/logstash/namespace.rb
 - lib/logstash/output_delegator.rb
 - lib/logstash/output_delegator_strategies/legacy.rb
@@ -439,7 +448,6 @@ files:
 - lib/logstash/plugin.rb
 - lib/logstash/plugins/hooks_registry.rb
 - lib/logstash/plugins/registry.rb
-- lib/logstash/program.rb
 - lib/logstash/queue_factory.rb
 - lib/logstash/runner.rb
 - lib/logstash/settings.rb
@@ -492,6 +500,7 @@ files:
 - spec/logstash/config/defaults_spec.rb
 - spec/logstash/config/loader_spec.rb
 - spec/logstash/config/mixin_spec.rb
+- spec/logstash/config/string_escape_spec.rb
 - spec/logstash/environment_spec.rb
 - spec/logstash/event_dispatcher_spec.rb
 - spec/logstash/event_spec.rb
@@ -509,6 +518,7 @@ files:
 - spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/instrument/periodic_poller/base_spec.rb
 - spec/logstash/instrument/periodic_poller/cgroup_spec.rb
+- spec/logstash/instrument/periodic_poller/dlq_spec.rb
 - spec/logstash/instrument/periodic_poller/jvm_spec.rb
 - spec/logstash/instrument/periodic_poller/load_average_spec.rb
 - spec/logstash/instrument/periodic_poller/os_spec.rb
@@ -517,6 +527,8 @@ files:
 - spec/logstash/json_spec.rb
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
+- spec/logstash/modules/logstash_config_spec.rb
+- spec/logstash/modules/scaffold_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
@@ -535,6 +547,7 @@ files:
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
+- spec/logstash/settings/splittable_string_array_spec.rb
 - spec/logstash/settings/string_spec.rb
 - spec/logstash/settings/time_value_spec.rb
 - spec/logstash/settings/writable_directory_spec.rb
@@ -610,6 +623,7 @@ test_files:
 - spec/logstash/config/defaults_spec.rb
 - spec/logstash/config/loader_spec.rb
 - spec/logstash/config/mixin_spec.rb
+- spec/logstash/config/string_escape_spec.rb
 - spec/logstash/environment_spec.rb
 - spec/logstash/event_dispatcher_spec.rb
 - spec/logstash/event_spec.rb
@@ -627,6 +641,7 @@ test_files:
 - spec/logstash/instrument/null_metric_spec.rb
 - spec/logstash/instrument/periodic_poller/base_spec.rb
 - spec/logstash/instrument/periodic_poller/cgroup_spec.rb
+- spec/logstash/instrument/periodic_poller/dlq_spec.rb
 - spec/logstash/instrument/periodic_poller/jvm_spec.rb
 - spec/logstash/instrument/periodic_poller/load_average_spec.rb
 - spec/logstash/instrument/periodic_poller/os_spec.rb
@@ -635,6 +650,8 @@ test_files:
 - spec/logstash/json_spec.rb
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
+- spec/logstash/modules/logstash_config_spec.rb
+- spec/logstash/modules/scaffold_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
@@ -653,6 +670,7 @@ test_files:
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
+- spec/logstash/settings/splittable_string_array_spec.rb
 - spec/logstash/settings/string_spec.rb
 - spec/logstash/settings/time_value_spec.rb
 - spec/logstash/settings/writable_directory_spec.rb