logstash-input-beats 3.1.32-java → 4.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8d8e94892931e1245d62c239e4ded4e99bbf4ca8ec5ba4fcff779d929a3e199b
-  data.tar.gz: bb4014ac994300ddf3d64ea87faa8134aa0c90174895792c60d0a99c4f9b36eb
+SHA1:
+  metadata.gz: c9aa6c0daffddf441754db642f9cc9a089c8b699
+  data.tar.gz: 19964fcdf384d408cc239add4841b7030a2c62d3
 SHA512:
-  metadata.gz: 47e6e478850c59fb22b26572618055c0f2b0f0806ab09beb1d4f4402b67b938e8999dfb74db40979ab06e56315768f2916100420c6c831e09ec2c99e118f3a34
-  data.tar.gz: d2d358db71bf1b0d7d64956e574154cad8f088601fc72ecac24444d380d8d56e2b4dac5833631d712e564b962a719766462fed228e9cbd55b71f281c8bc943ac
+  metadata.gz: f7f547e41df1115a94d5a41b1b2d97d96304b43c13db7313819b8d0c3a989883c3db44772737b0d5e1d2df746ecb9cdd4332f9c3bc3cc99172906f2af098687d
+  data.tar.gz: 9e027ab384eda03be67df92c025d16d500e94b07d26eb5eda8caff72ab8fc5c7e2d22d7c1e5ab8851f557fac966fb3a359810e9ba203244f3884938731de0b20

data/CHANGELOG.md

@@ -1,52 +1,11 @@
-## 3.1.32
- - Fixed handling of batches where the sequence numbers do not start with 1 [#342](https://github.com/logstash-plugins/logstash-input-beats/pull/342)
+## 4.0.1
+ - Breaking change: Logstash will no longer start when multiline codec is used with the Beats input plugin
 
-## 3.1.31
-  - Update jackson deps to 2.9.5
+## 4.0.0
+ - Verion yanked from RubyGems for packaging issues
 
-## 3.1.30
-  - Ensure that the keep-alive is sent for ALL pending batches when the pipeline is blocked, not only the batches attempting to write to the queue. #310  
-  
-## 3.1.29
-  - Update jackson deps to 2.9.4
-  
-## 3.1.28
-  - Improvements to back pressure handling and memory management #301
-  
-## 3.1.27
-  - Update jackson deps to 2.9.1
-
-## 3.1.26
-  - Re-order Netty pipeline to avoid NullPointerExceptions in KeepAliveHandler when Logstash is under load
-  - Improve exception logging
-
-## 3.1.25
- - Fix an issue with close_wait connection and making sure the keep alive are send back to the client all the time. #272
-
-## 3.1.24
- - Documentation changes
-
-## 3.1.23
- - Fix logging from Java #236
-
-## 3.1.22
- - Additional default cipher PR#242
-
-## 3.1.21
- - Remove duplicate jars
-
-## 3.1.20
- - Document changes
-
-## 3.1.19
- - Fix ability to set SSL protocols #228
-
-## 3.1.18
- - Relax version of concurrent-ruby to `~> 1.0`
-
-## 3.1.17
+## 3.1.16
  - Docs: Add note indicating that the multiline codec should not be used with the Beats input plugin
- - Deprecate warning for multiline codec with the Beats input plugin
 
 ## 3.1.15
  - DEBUG: Add information about the remote when an exception is catched #192

data/Gemfile

@@ -2,9 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-logstash_path = "../../logstash"
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
 
-if Dir.exist?(logstash_path) && ENV["LOGSTASH_SOURCE"] == "1"
+if Dir.exist?(logstash_path) && use_logstash_source
   gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
   gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
 end

data/VERSION

@@ -1 +1 @@
-3.1.32
+4.0.1

data/docs/index.asciidoc

@@ -7,14 +7,14 @@ START - GENERATED VARIABLES, DO NOT EDIT!
 :version: %VERSION%
 :release_date: %RELEASE_DATE%
 :changelog_url: %CHANGELOG_URL%
-:include_path: ../../../../logstash/docs/include
+:include_path: ../../../logstash/docs/include
 ///////////////////////////////////////////
 END - GENERATED VARIABLES, DO NOT EDIT!
 ///////////////////////////////////////////
 
-[id="plugins-{type}s-{plugin}"]
+[id="plugins-{type}-{plugin}"]
 
-=== Beats input plugin
+=== Beats
 
 include::{include_path}/plugin_header.asciidoc[]
 
@@ -59,7 +59,7 @@ result in the failure to start Logstash.
 [id="plugins-{type}s-{plugin}-options"]
 ==== Beats Input Configuration Options
 
-This plugin supports the following configuration options plus the <<plugins-{type}s-{plugin}-common-options>> described later.
+This plugin supports the following configuration options plus the <<plugins-{type}s-common-options>> described later.
 
 [cols="<,<,<",options="header",]
 |=======================================================================
@@ -80,7 +80,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-tls_min_version>> |<<number,number>>|No
 |=======================================================================
 
-Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
+Also see <<plugins-{type}s-common-options>> for a list of options supported by all
 input plugins.
 
 &nbsp;
@@ -89,7 +89,7 @@ input plugins.
 ===== `cipher_suites` 
 
   * Value type is <<array,array>>
-  * Default value is `java.lang.String[TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256]@459cfcca`
+  * Default value is `java.lang.String[TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256]@459cfcca`
 
 The list of ciphers suite to use, listed by priorities.
 
@@ -237,5 +237,4 @@ The minimum TLS version allowed for the encrypted connections. The value must be
 
 
 
-[id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]

data/lib/logstash-input-beats_jars.rb

@@ -4,9 +4,9 @@ require 'jar_dependencies'
 require_jar('io.netty', 'netty-all', '4.1.3.Final')
 require_jar('io.netty', 'netty-tcnative-boringssl-static', '1.1.33.Fork23')
 require_jar('org.javassist', 'javassist', '3.20.0-GA')
-require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.9.5')
-require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.9.5')
-require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.9.5')
-require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.5')
-require_jar('org.apache.logging.log4j', 'log4j-api', '2.6.2')
-require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.32')
+require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.7.5')
+require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.7.5')
+require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.7.5')
+require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.5')
+require_jar('log4j', 'log4j', '1.2.17')
+require_jar('org.logstash.beats', 'logstash-input-beats', '4.0.1')

data/lib/logstash/inputs/beats.rb

@@ -2,7 +2,6 @@
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "logstash/timestamp"
-require "logstash/codecs/identity_map_codec"
 require "logstash/codecs/multiline"
 require "logstash/util"
 require "logstash-input-beats_jars"
@@ -121,9 +120,6 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   # Close Idle clients after X seconds of inactivity.
   config :client_inactivity_timeout, :validate => :number, :default => 60
 
-  # Beats handler executor thread
-  config :executor_threads, :validate => :number, :default => LogStash::Config::CpuCoreStrategy.maximum
-
   def register
     # For Logstash 2.4 we need to make sure that the logger is correctly set for the
     # java classes before actually loading them.
@@ -150,26 +146,18 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
       raise LogStash::ConfigurationError, "Using `verify_mode` set to PEER or FORCE_PEER, requires the configuration of `certificate_authorities`"
     end
 
+    # Logstash 6.x breaking change (introduced with 4.0.0 of this gem)
     if @codec.kind_of? LogStash::Codecs::Multiline
-      @logger.warn("WARNING! - Multiline codec with beats input has been deprecated. Support for this configuration will be removed in a future version. Please refer to the beats documentation for how to best manage multiline data. See https://www.elastic.co/guide/en/beats/filebeat/current/multiline-examples.html")
+      raise LogStash::ConfigurationError, "Multiline codec with beats input is not supported. Please refer to the beats documentation for how to best manage multiline data. See https://www.elastic.co/guide/en/beats/filebeat/current/multiline-examples.html"
     end
 
     @logger.info("Beats inputs: Starting input listener", :address => "#{@host}:#{@port}")
 
-    # wrap the configured codec to support identity stream
-    # from the producers if running with the multiline codec.
-    #
-    # If they dont need an identity map, codec are stateless and can be reused
-    # accross multiples connections.
-    if need_identity_map?
-      @codec = LogStash::Codecs::IdentityMapCodec.new(@codec)
-    end
-
     @server = create_server
   end # def register
 
   def create_server
-    server = org.logstash.beats.Server.new(@host, @port, @client_inactivity_timeout, @executor_threads)
+    server = org.logstash.beats.Server.new(@host, @port, @client_inactivity_timeout)
     if @ssl
 
       begin
@@ -213,10 +201,6 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
     @server.stop unless @server.nil?
   end
 
-  def need_identity_map?
-    @codec.kind_of?(LogStash::Codecs::Multiline)
-  end
-
   def client_authentification?
     @ssl_certificate_authorities && @ssl_certificate_authorities.size > 0
   end

data/lib/tasks/build.rake

@@ -3,7 +3,7 @@ require "jars/installer"
 require "fileutils"
 
 task :vendor do
-  exit(1) unless system './gradlew vendor'
+  system("./gradlew vendor")
   version = File.read("VERSION").strip
 end
 

data/lib/tasks/test.rake

@@ -2,11 +2,10 @@
 OS_PLATFORM = RbConfig::CONFIG["host_os"]
 VENDOR_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor"))
 
-#TODO: Figure out better means to keep this version in sync
 if OS_PLATFORM == "linux"
-  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.0.0-alpha2-linux-x86_64.tar.gz"
+  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-5.0.0-linux-x86_64.tar.gz"
 elsif OS_PLATFORM == "darwin"
-  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.0.0-alpha2-darwin-x86_64.tar.gz"
+  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-5.0.0-darwin-x86_64.tar.gz"
 end
 
 LSF_URL = "https://download.elastic.co/logstash-forwarder/binaries/logstash-forwarder_#{OS_PLATFORM}_amd64"

data/logstash-input-beats.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_runtime_dependency "logstash-codec-plain"
-  s.add_runtime_dependency "concurrent-ruby", "~> 1.0"
+  s.add_runtime_dependency "concurrent-ruby", [ ">= 0.9.2", "<= 1.0.0" ]
   s.add_runtime_dependency "thread_safe", "~> 0.3.5"
   s.add_runtime_dependency "logstash-codec-multiline", ">= 2.0.5"
   s.add_runtime_dependency 'jar-dependencies', '~> 0.3.4'

data/spec/inputs/beats_spec.rb

@@ -16,44 +16,19 @@ describe LogStash::Inputs::Beats do
 
   context "#register" do
     context "host related configuration" do
-      let(:config) { super.merge!({ "host" => host, "port" => port, "client_inactivity_timeout" => client_inactivity_timeout, "executor_threads" => threads }) }
+      let(:config) { super.merge!({ "host" => host, "port" => port, "client_inactivity_timeout" => client_inactivity_timeout }) }
       let(:host) { "192.168.1.20" }
       let(:port) { 9000 }
       let(:client_inactivity_timeout) { 400 }
-      let(:threads) { 10 }
 
       subject(:plugin) { LogStash::Inputs::Beats.new(config) }
 
       it "sends the required options to the server" do
-        expect(org.logstash.beats.Server).to receive(:new).with(host, port, client_inactivity_timeout, threads)
+        expect(org.logstash.beats.Server).to receive(:new).with(host, port, client_inactivity_timeout)
         subject.register
       end
     end
 
-    context "identity map" do
-      subject(:plugin) { LogStash::Inputs::Beats.new(config) }
-      before { plugin.register }
-
-      context "when using the multiline codec" do
-        let(:codec) { LogStash::Codecs::Multiline.new("pattern" => '^2015',
-                                                      "what" => "previous",
-                                                      "negate" => true) }
-        let(:config) { super.merge({ "codec" => codec }) }
-
-        it "wraps the codec with the identity_map" do
-          expect(plugin.codec).to be_kind_of(LogStash::Codecs::IdentityMapCodec)
-        end
-      end
-
-      context "when using non buffered codecs" do
-        let(:config) { super.merge({ "codec" => "json" }) }
-
-        it "doesnt wrap the codec with the identity map" do
-          expect(plugin.codec).to be_kind_of(LogStash::Codecs::JSON)
-        end
-      end
-    end
-
     it "raise no exception" do
       plugin = LogStash::Inputs::Beats.new(config)
       expect { plugin.register }.not_to raise_error
@@ -147,6 +122,18 @@ describe LogStash::Inputs::Beats do
         end
       end
     end
+
+    context "with multiline codec" do
+      let(:codec) { LogStash::Codecs::Multiline.new("pattern" => '^2015',
+                                                    "what" => "previous",
+                                                    "negate" => true) }
+      let(:config) { super.merge({ "codec" => codec }) }
+
+      it "raise a ConfigurationError when multiline codec is set" do
+        plugin = LogStash::Inputs::Beats.new(config)
+        expect {plugin.register}.to raise_error(LogStash::ConfigurationError, "Multiline codec with beats input is not supported. Please refer to the beats documentation for how to best manage multiline data. See https://www.elastic.co/guide/en/beats/filebeat/current/multiline-examples.html")
+      end
+    end
   end
 
   context "when interrupting the plugin" do

data/spec/integration/filebeat_spec.rb

@@ -52,7 +52,6 @@ describe "Filebeat", :integration => true do
   before :each do
     FileUtils.rm_rf(File.join(File.dirname(__FILE__), "..", "..", "vendor", "filebeat", "data"))
     start_client
-    raise 'Filebeat did not start in alloted time' unless is_alive
     sleep(20) # give some time to FB to send something
   end
 
@@ -77,7 +76,7 @@ describe "Filebeat", :integration => true do
   end
 
   ############################################################
-  # Actuals tests
+  # Actuals tests 
   context "Plain TCP" do
     include_examples "send events"
   end
@@ -191,9 +190,6 @@ describe "Filebeat", :integration => true do
       context "CA root" do
         include_context "Root CA"
 
-        let_tmp_file(:certificate_key_file) { convert_to_pkcs8(certificate_data.last) }
-        let_tmp_file(:certificate_file) { certificate_data.first }
-
         context "directly signed client certificate" do
           let(:certificate_authorities) { [root_ca_certificate_file] }
           let(:certificate_data) { Flores::PKI.create_client_certicate("CN=localhost", root_ca_certificate, root_ca_key) }
@@ -206,7 +202,7 @@ describe "Filebeat", :integration => true do
 
           let(:certificate_data) { Flores::PKI.create_client_certicate("CN=localhost", intermediate_ca_certificate, intermediate_ca_key) }
           let(:certificate_authorities) { [certificate_authorities_chain] }
-
+          
           include_examples "send events"
         end
       end
@@ -228,7 +224,7 @@ describe "Filebeat", :integration => true do
         end
 
         let(:input_config) do
-          super.merge({
+          super.merge({ 
             "ssl" => true,
             "ssl_certificate_authorities" => certificate_authorities,
             "ssl_certificate" => server_certificate_file,
@@ -253,8 +249,6 @@ describe "Filebeat", :integration => true do
 
           let_tmp_file(:server_certificate_file) { server_certificate_data.first }
           let_tmp_file(:server_certificate_key_file) { convert_to_pkcs8(server_certificate_data.last) }
-          let_tmp_file(:certificate_file) { certificate_data.first }
-          let_tmp_file(:certificate_key_file) { convert_to_pkcs8(certificate_data.last) }
 
           context "directly signed client certificate" do
             let(:certificate_authorities) { [root_ca_certificate_file] }
@@ -268,7 +262,7 @@ describe "Filebeat", :integration => true do
             include_context "Intermediate CA"
 
             let(:certificate_data) { Flores::PKI.create_client_certicate("CN=localhost", intermediate_ca_certificate, intermediate_ca_key) }
-            let(:server_certificate_data) { Flores::PKI.create_client_certicate("CN=localhost", intermediate_ca_certificate, intermediate_ca_key) }
+            let(:server_certificate_data) { Flores::PKI.create_client_certicate("CN=localhost", intermediate_ca_certificate, intermediate_ca_key) } 
             let(:certificate_authorities) { [intermediate_ca_certificate_file] }
 
             include_examples "send events"
@@ -304,7 +298,7 @@ describe "Filebeat", :integration => true do
 
               let(:server_certificate_data) { Flores::PKI.create_client_certicate("CN=localhost", root_ca_certificate, root_ca_key) }
 
-              context "client from primary CA" do
+              context "client from primary CA" do 
                 include_examples "send events"
               end
 

data/spec/integration/logstash_forwarder_spec.rb

@@ -55,6 +55,7 @@ describe "Logstash-Forwarder", :integration => true do
       f.write(events.join("\n") + "\n")
     end
     sleep(1) # give some time to the clients to pick up the changes
+    stop_client
   end
 
   after :each do

data/spec/support/client_process_helpers.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "childprocess"
 module ClientProcessHelpers
-  def start_client(timeout = 5)
+  def start_client(timeout = 1)
     @client_out = Stud::Temporary.file
     @client_out.sync
 
@@ -11,26 +11,13 @@ module ClientProcessHelpers
     ChildProcess.posix_spawn = true
     @process.start
 
-    sleep_interval = 0.1
-    max_iterations = (timeout / sleep_interval).to_i
-    max_iterations.times do
-      sleep(sleep_interval)
-      if @process.alive?
-        break
-      end
-    end
-    #Note - can not raise error here if process failed to start, since some tests expects for the process to not start due to invalid configuration
-
+    sleep(0.1)
     @client_out.rewind
 
     # can be used to helper debugging when a test fails
     @execution_output = @client_out.read
   end
 
-  def is_alive
-    return @process.alive?
-  end
-
   def stop_client
     begin
       @process.poll_for_exit(5)

data/spec/support/flores_extensions.rb

@@ -1,68 +1,49 @@
 # encoding: utf-8
 require "flores/pki"
 require "flores/random"
-require "socket"
 
 module Flores
   module Random
     DEFAULT_PORT_RANGE = 1024..65535
+    DEFAULT_PORT_CHECK_TIMEOUT = 1
+    DEFAULT_MAXIMUM_PORT_FIND_TRY = 15
+
     class << self
       def port(range = DEFAULT_PORT_RANGE)
-        integer(range)
-      end
-    end
-  end
-
-  module PKI
-
-    # Monkey patched the fix for https://github.com/jordansissel/ruby-flores/issues/9
-    # TODO: remove this once Flores is released with fix.
-    CertificateSigningRequest.class_eval do
-      def create
-        validate!
-        extensions = OpenSSL::X509::ExtensionFactory.new
-        extensions.subject_certificate = certificate
-        extensions.issuer_certificate = self_signed? ? certificate : signing_certificate
-
-        certificate.issuer = extensions.issuer_certificate.subject
-        certificate.add_extension(extensions.create_extension("subjectKeyIdentifier", "hash", false))
-
-        if want_signature_ability?
-          # Create a CA.
-          certificate.add_extension(extensions.create_extension("basicConstraints", "CA:TRUE", true))
-          # Rough googling seems to indicate at least keyCertSign is required for CA and intermediate certs.
-          certificate.add_extension(extensions.create_extension("keyUsage", "keyCertSign, cRLSign, digitalSignature", true))
-        else
-          # Create a client+server certificate
-          #
-          # It feels weird to create a certificate that's valid as both server and client, but a brief inspection of major
-          # web properties (apple.com, google.com, yahoo.com, github.com, fastly.com, mozilla.com, amazon.com) reveals that
-          # major web properties have certificates with both clientAuth and serverAuth extended key usages. Further,
-          # these major server certificates all have digitalSignature and keyEncipherment for key usage.
-          #
-          # Here's the command I used to check this:
-          #    echo mozilla.com apple.com github.com google.com yahoo.com fastly.com elastic.co amazon.com \
-          #    | xargs -n1 sh -c 'openssl s_client -connect $1:443 \
-          #    | sed -ne "/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p" \
-          #    | openssl x509 -text -noout | sed -ne "/X509v3 extensions/,/Signature Algorithm/p" | sed -e "s/^/$1 /"' - \
-          #    | grep -A2 'Key Usage'
-          certificate.add_extension(extensions.create_extension("keyUsage", "digitalSignature, keyEncipherment", true))
-          certificate.add_extension(extensions.create_extension("extendedKeyUsage", "clientAuth, serverAuth", false))
+        try = 0
+        while try < DEFAULT_MAXIMUM_PORT_FIND_TRY
+          candidate = integer(range)
+
+          if port_available?(candidate)
+            break
+          else
+            try += 1
+          end
         end
+        
+        raise "Flores.random_port: Cannot find an available port, tried #{DEFAULT_MAXIMUM_PORT_FIND_TRY} times, range was: #{range}" if try == DEFAULT_MAXIMUM_PORT_FIND_TRY
 
-        if @subject_alternates
-          certificate.add_extension(extensions.create_extension("subjectAltName", @subject_alternates.join(",")))
+        candidate
+      end
+      
+      def port_available?(port)
+        begin
+          server = TCPServer.new(port)
+          available = true
+        rescue # Assume that any errors can do this
+          available = false
+        ensure
+          server.close if server
         end
 
-        certificate.serial = OpenSSL::BN.new(serial)
-        certificate.sign(signing_key, digest_method)
-        certificate
+        return available
       end
     end
+  end
 
-
+  module PKI
     DEFAULT_CERTIFICATE_OPTIONS = {
-      :duration => 86400, #one day
+      :duration => Flores::Random.number(100..2000),
       :key_size => GENERATE_DEFAULT_KEY_SIZE, 
       :exponent => GENERATE_DEFAULT_EXPONENT,
       :want_signature_ability => false
@@ -97,9 +78,5 @@ module Flores
 
       [csr.create, client_key]
     end
-
-
-
   end
 end
-

data/spec/support/integration_shared_context.rb

@@ -3,7 +3,7 @@ require "flores/random"
 
 shared_examples "send events" do
   it "successfully send the events" do
-    try(25) { expect(queue.size).to eq(number_of_events), "Expected: #{number_of_events} got: #{queue.size}, execution output:\n #{@execution_output}" }
+    try(50) { expect(queue.size).to eq(number_of_events), "Expected: #{number_of_events} got: #{queue.size}, execution output:\n #{@execution_output}" }
     expect(queue.collect { |e| e.get("message") }).to eq(events)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 3.1.32
+  version: 4.0.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -47,17 +47,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   name: concurrent-ruby
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -212,9 +218,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem is a Logstash plugin required to be installed on top of the
-  Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
-  gem is not a stand-alone program
+description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -258,15 +262,15 @@ files:
 - spec/support/integration_shared_context.rb
 - spec/support/logstash_test.rb
 - spec/support/shared_examples.rb
-- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.9.5/jackson-annotations-2.9.5.jar
-- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.5/jackson-core-2.9.5.jar
-- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.5/jackson-databind-2.9.5.jar
-- vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.5/jackson-module-afterburner-2.9.5.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.7.5/jackson-annotations-2.7.5.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.7.5/jackson-core-2.7.5.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.7.5/jackson-databind-2.7.5.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.7.5/jackson-module-afterburner-2.7.5.jar
 - vendor/jar-dependencies/io/netty/netty-all/4.1.3.Final/netty-all-4.1.3.Final.jar
 - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/1.1.33.Fork23/netty-tcnative-boringssl-static-1.1.33.Fork23.jar
-- vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar
+- vendor/jar-dependencies/log4j/log4j/1.2.17/log4j-1.2.17.jar
 - vendor/jar-dependencies/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar
-- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.32/logstash-input-beats-3.1.32.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/4.0.1/logstash-input-beats-4.0.1.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -290,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Receive events using the lumberjack protocol.