logstash-core 6.0.0.beta2-java → 6.0.0-java

data/spec/logstash/timestamp_spec.rb

@@ -13,10 +13,10 @@ describe LogStash::Timestamp do
     # we may need to use `be_within(0.000999999).of()` in other places too
     it "should work" do
       t = LogStash::Timestamp.new
-      expect(t.time.to_i).to be_within(1).of Time.now.to_i
+      expect(t.time.to_i).to be_within(2).of Time.now.to_i
 
       t = LogStash::Timestamp.now
-      expect(t.time.to_i).to be_within(1).of Time.now.to_i
+      expect(t.time.to_i).to be_within(2).of Time.now.to_i
 
       now = DateTime.now.to_time.utc
       t = LogStash::Timestamp.new(now)

data/spec/logstash/util/cloud_setting_id_spec.rb

@@ -0,0 +1,93 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/util/cloud_setting_id"
+
+describe LogStash::Util::CloudSettingId do
+  let(:input) { "foobar:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy" }
+  subject { described_class.new(input) }
+
+  describe "when given unacceptable input" do
+    it "a nil input does not raise an exception" do
+      expect{described_class.new(nil)}.not_to raise_exception
+    end
+    it "when given a nil input, the accessors are all nil" do
+      cloud_id = described_class.new(nil)
+      expect(cloud_id.original).to be_nil
+      expect(cloud_id.decoded).to be_nil
+      expect(cloud_id.label).to be_nil
+      expect(cloud_id.elasticsearch_host).to be_nil
+      expect(cloud_id.kibana_host).to be_nil
+      expect(cloud_id.elasticsearch_scheme).to be_nil
+      expect(cloud_id.kibana_scheme).to be_nil
+    end
+
+    context "when a malformed value is given" do
+      let(:raw) {%w(first second)}
+      let(:input) { described_class.cloud_id_encode(*raw) }
+      it "raises an error" do
+        expect{subject}.to raise_exception(ArgumentError, "Cloud Id does not decode. You may need to enable Kibana in the Cloud UI. Received: \"#{raw[0]}$#{raw[1]}\".")
+      end
+    end
+
+    context "when at least one segment is empty" do
+      let(:raw) {["first", "", "third"]}
+      let(:input) { described_class.cloud_id_encode(*raw) }
+      it "raises an error" do
+        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{raw[0]}$#{raw[1]}$#{raw[2]}\".")
+      end
+    end
+
+    context "when elasticsearch segment is undefined" do
+      let(:raw) {%w(us-east-1.aws.found.io undefined my-kibana)}
+      let(:input) { described_class.cloud_id_encode(*raw) }
+      it "raises an error" do
+        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, elasticsearch segment is 'undefined', literally.")
+      end
+    end
+
+    context "when kibana segment is undefined" do
+      let(:raw) {%w(us-east-1.aws.found.io my-elastic-cluster undefined)}
+      let(:input) { described_class.cloud_id_encode(*raw) }
+      it "raises an error" do
+        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, the kibana segment is 'undefined', literally. You may need to enable Kibana in the Cloud UI.")
+      end
+    end
+  end
+
+  describe "without a label" do
+    let(:input) { "dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy" }
+    it "#label is empty" do
+      expect(subject.label).to be_empty
+    end
+    it "#decode is set" do
+      expect(subject.decoded).to eq("us-east-1.aws.found.io$notareal$identifier")
+    end
+  end
+
+  describe "when given acceptable input, the accessors:" do
+    it '#original has a value' do
+      expect(subject.original).to eq(input)
+    end
+    it '#decoded has a value' do
+      expect(subject.decoded).to eq("us-east-1.aws.found.io$notareal$identifier")
+    end
+    it '#label has a value' do
+      expect(subject.label).to eq("foobar")
+    end
+    it '#elasticsearch_host has a value' do
+      expect(subject.elasticsearch_host).to eq("notareal.us-east-1.aws.found.io:443")
+    end
+    it '#elasticsearch_scheme has a value' do
+      expect(subject.elasticsearch_scheme).to eq("https")
+    end
+    it '#kibana_host has a value' do
+      expect(subject.kibana_host).to eq("identifier.us-east-1.aws.found.io:443")
+    end
+    it '#kibana_scheme has a value' do
+      expect(subject.kibana_scheme).to eq("https")
+    end
+    it '#to_s has a value of #decoded' do
+      expect(subject.to_s).to eq(subject.decoded)
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -77,7 +77,7 @@ def start_agent(agent)
     end
   end
 
-  sleep(0.1) unless subject.running?
+  wait(30).for { agent.running? }.to be(true)
   agent_task
 end
 

data/spec/support/mocks_classes.rb

@@ -14,6 +14,20 @@ module LogStash
       end
     end
   end
+
+  module Filters
+    class DummyFilter < LogStash::Filters::Base
+      config_name "dummyfilter"
+
+      def register
+      end
+
+      def filter(event)
+        # noop
+      end
+    end
+  end
+
   module Outputs
     class DummyOutput < LogStash::Outputs::Base
       config_name "dummyoutput"

data/spec/support/shared_contexts.rb

@@ -21,12 +21,21 @@ shared_context "api setup" do
     settings = mock_settings
     config_string = "input { generator {id => 'api-generator-pipeline' count => 100 } } output { dummyoutput {} }"
     settings.set("config.string", config_string)
+    settings.set("config.reload.automatic", false)
     @agent = make_test_agent(settings)
     @agent.execute
+    pipeline_config = mock_pipeline_config(:main, "input { generator { id => '123' } } output { null {} }")
+    pipeline_creator =  LogStash::PipelineAction::Create.new(pipeline_config, @agent.metric)
+    @pipelines = Hash.new
+    expect(pipeline_creator.execute(@agent, @pipelines)).to be_truthy
   end
 
   after :all do
     @agent.shutdown
+    @pipelines.each do |_, pipeline|
+      pipeline.shutdown
+      pipeline.thread.join
+    end
   end
 
   include Rack::Test::Methods

data/versions-gem-copy.yml

@@ -0,0 +1,23 @@
+---
+logstash: 6.0.0
+logstash-core: 6.0.0
+logstash-core-plugin-api: 2.1.16
+jruby:
+  version: 9.1.13.0
+  sha1: 815bac27d5daa1459a4477d6d80584f007ce6a68
+
+# jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby for logstash runtime only,
+# not for the compile-time jars
+#
+#jruby-runtime-override:
+#  url: http://ci.jruby.org/snapshots/previous/jruby-bin-9.1.13.0-SNAPSHOT.tar.gz
+#  version: 9.1.13.0-SNAPSHOT
+#  sha1: IGNORE
+
+# Note: this file is copied to the root of logstash-core because its gemspec needs it when
+#       bundler evaluates the gemspec via bin/logstash
+# Ensure Jackson version here is kept in sync with version used by jrjackson gem
+jrjackson: 0.4.4
+jackson: 2.9.1
+
+# This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta2
+  version: 6.0.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.20
   name: jruby-openssl
@@ -159,7 +159,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.20
 - !ruby/object:Gem::Dependency
@@ -251,7 +251,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
   name: jrjackson
   prerelease: false
   type: :runtime
@@ -259,7 +259,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -556,6 +556,7 @@ files:
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
 - spec/logstash/modules/cli_parser_spec.rb
+- spec/logstash/modules/kibana_client_spec.rb
 - spec/logstash/modules/logstash_config_spec.rb
 - spec/logstash/modules/scaffold_spec.rb
 - spec/logstash/modules/settings_merger_spec.rb
@@ -593,6 +594,7 @@ files:
 - spec/logstash/util/buftok_spec.rb
 - spec/logstash/util/byte_value_spec.rb
 - spec/logstash/util/charset_spec.rb
+- spec/logstash/util/cloud_setting_id_spec.rb
 - spec/logstash/util/duration_formatter_spec.rb
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb
@@ -609,6 +611,7 @@ files:
 - spec/support/mocks_classes.rb
 - spec/support/shared_contexts.rb
 - spec/support/shared_examples.rb
+- versions-gem-copy.yml
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -624,20 +627,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      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.7.3
-- jar com.fasterxml.jackson.core:jackson-databind, 2.7.3
-- jar com.fasterxml.jackson.core:jackson-annotations, 2.7.3
-- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.7.3
-- jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.7.3
+- jar com.fasterxml.jackson.core:jackson-core, 2.9.1
+- jar com.fasterxml.jackson.core:jackson-databind, 2.9.1
+- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.1
+- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.1
+- jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.1
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
@@ -695,6 +698,7 @@ test_files:
 - spec/logstash/legacy_ruby_event_spec.rb
 - spec/logstash/legacy_ruby_timestamp_spec.rb
 - spec/logstash/modules/cli_parser_spec.rb
+- spec/logstash/modules/kibana_client_spec.rb
 - spec/logstash/modules/logstash_config_spec.rb
 - spec/logstash/modules/scaffold_spec.rb
 - spec/logstash/modules/settings_merger_spec.rb
@@ -732,6 +736,7 @@ test_files:
 - spec/logstash/util/buftok_spec.rb
 - spec/logstash/util/byte_value_spec.rb
 - spec/logstash/util/charset_spec.rb
+- spec/logstash/util/cloud_setting_id_spec.rb
 - spec/logstash/util/duration_formatter_spec.rb
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb