logstash-input-beats 3.1.4-java → 3.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04fc5e35b3be9c12c6f6c04ecdd3ea5d7274fda7
-  data.tar.gz: a4039f40b835f9a973c6f09af09b2daaae325406
+  metadata.gz: e0e93c97b5dfb652577d7c9d54cf610fa79c3181
+  data.tar.gz: cb73d6cdea7be0e3fc2392f7a5b6c990cdedee84
 SHA512:
-  metadata.gz: eac81c0200b46334f340e555414c35e5bea843dae79b0d0b07f763ba148cfa32e7c3ed5cc207df939e8c0560bf5997f1dfc129db78b8076cc34a222c2fa0ae64
-  data.tar.gz: d55a85ad9f0daf8b5b48b8b883d484a4bcaa0dec04e8c4f7ea9f4c8ea1b9e48fce23eb3c4bd8aedd2cbf1438c2149f0abcb58001f53a7a622aafbc6ad20267fc
+  metadata.gz: 482e8320f3d5557c4f5b6957bb7a4a51350135bda91fd5b999eda3b328d2a762b8b944e776c5b21d0ab7d70bfb641f78daae7bc42ebf4d2004afcd10c3fa8f12
+  data.tar.gz: d4d9599c355c60f3bfe13ec2392f6a5649c8cefcfb7eeebe3b8a6bf23d879e95ef52e00688aa6152259849ed3619ef817c6ec5338edc83a49b5499ec16a5fa14

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.1.5
+   - Fix an issue when using a passphrase was raising a TypeError #138
+   - Fix the filebeat integration suite to use the new `ssl` option instead of `tls`
+   - Use correct log4j logger call to be compatible with 2.4
+
 ## 3.1.4
    - Add a note concerning the requirement of the PKCS8 format for the private key.
 

data/VERSION

@@ -1 +1 @@
-3.1.4
+3.1.5

data/lib/logstash-input-beats_jars.rb

@@ -9,4 +9,4 @@ 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', '3.1.4')
+require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.5')

data/lib/logstash/inputs/beats.rb

@@ -141,8 +141,8 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
 
   def register
     # Logstash 2.4
-    if defined?(LogStash::Logging) && LogStash::Logging.respond_to?(:setup_log4j)
-      LogStash::Logging.setup_log4j(@logger)
+    if defined?(LogStash::Logger) && LogStash::Logger.respond_to?(:setup_log4j)
+      LogStash::Logger.setup_log4j(@logger)
     end
 
     if !@ssl
@@ -169,7 +169,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   def create_server
     server = org.logstash.beats.Server.new(@port)
     if @ssl
-      ssl_builder = org.logstash.netty.SslSimpleBuilder.new(ssl_certificate, ssl_key, ssl_key_passphrase)
+      ssl_builder = org.logstash.netty.SslSimpleBuilder.new(@ssl_certificate, @ssl_key, @ssl_key_passphrase.nil? ? nil : @ssl_key_passphrase.value)
         .setProtocols(convert_protocols)
         .setCipherSuites(normalized_ciphers)
 

data/lib/tasks/test.rake

@@ -3,9 +3,9 @@ OS_PLATFORM = RbConfig::CONFIG["host_os"]
 VENDOR_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor"))
 
 if OS_PLATFORM == "linux"
-  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha6-SNAPSHOT-linux-x86_64.tar.gz"
+  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-6.0.0-alpha1-SNAPSHOT-linux-x86_64.tar.gz"
 elsif OS_PLATFORM == "darwin"
-  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha6-SNAPSHOT-darwin-x86_64.tar.gz"
+  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-6.0.0-alpha1-SNAPSHOT-darwin-x86_64.tar.gz"
 end
 
 LSF_URL = "https://download.elastic.co/logstash-forwarder/binaries/logstash-forwarder_#{OS_PLATFORM}_amd64"

data/spec/integration/filebeat_spec.rb

@@ -33,13 +33,12 @@ describe "Filebeat", :integration => true do
 
   let(:filebeat_exec) { FILEBEAT_BINARY }
 
-  let_empty_tmp_file(:registry_file)
   let(:filebeat_config) do
     {
       "filebeat" => {
         "prospectors" => [{ "paths" => [log_file],  "input_type" => "log" }],
-        "registry_file" => registry_file,
-        "scan_frequency" => "1s"
+        "scan_frequency" => "1s",
+        "idle_timeout" => "1s"
       },
       "output" => {
         "logstash" => { "hosts" => ["#{host}:#{port}"] },
@@ -84,14 +83,14 @@ describe "Filebeat", :integration => true do
           "output" => {
             "logstash" => {
               "hosts" => ["#{host}:#{port}"],
-              "tls" => { "certificate_authorities" => certificate_authorities }
+              "ssl" => { "certificate_authorities" => certificate_authorities }
             },
             "logging" => { "level" => "debug" }
           }})
       end
 
       let(:input_config) do
-        super.merge({ 
+        super.merge({
           "ssl" => true,
           "ssl_certificate" => certificate_file,
           "ssl_key" => certificate_key_file
@@ -106,8 +105,38 @@ describe "Filebeat", :integration => true do
 
       context "self signed certificate" do
         include_examples "send events"
+
+
+        # Refactor this to use Flores's PKI instead of openssl command line
+        # see: https://github.com/jordansissel/ruby-flores/issues/7
+        context "with a passphrase" do
+          let!(:temporary_directory) { Stud::Temporary.pathname }
+          let(:certificate_key_file) { ::File.join(temporary_directory, "certificate.key") }
+          let(:certificate_key_file_pkcs8) { ::File.join(temporary_directory, "certificate.pkcs8.key") }
+          let(:certificate_file) { ::File.join(temporary_directory, "certificate.crt") }
+          let(:passphrase) { "foobar" }
+          let(:beats) {
+            # Since we are using a shared context, this not obvious to make sure the openssl command
+            # is run before starting beats so we do it just before initializing it.
+            FileUtils.mkdir_p(temporary_directory)
+            openssl_cmd = "openssl req -x509  -batch -newkey rsa:2048 -keyout #{temporary_directory}/certificate.key -out #{temporary_directory}/certificate.crt -subj /CN=localhost -passout pass:#{passphrase}"
+            system(openssl_cmd)
+            convert_key_cmd = "openssl pkcs8 -topk8 -in #{temporary_directory}/certificate.key -out #{certificate_key_file_pkcs8} -passin pass:#{passphrase} -passout pass:#{passphrase}"
+            system(convert_key_cmd)
+
+            LogStash::Inputs::Beats.new(input_config)
+          }
+          let(:input_config) {
+            super.merge({
+            "ssl_key_passphrase" => passphrase,
+            "ssl_key" => certificate_key_file_pkcs8
+          })}
+
+          include_examples "send events"
+        end
       end
 
+
       context "CA root" do
         include_context "Root CA"
 
@@ -134,10 +163,10 @@ describe "Filebeat", :integration => true do
             "output" => {
               "logstash" => {
                 "hosts" => ["#{host}:#{port}"],
-                "tls" => { 
+                "ssl" => {
                   "certificate_authorities" => certificate_authorities,
                   "certificate" => certificate_file,
-                  "certificate_key" => certificate_key_file
+                  "key" => certificate_key_file
                 }
               },
               "logging" => { "level" => "debug" }
@@ -215,10 +244,10 @@ describe "Filebeat", :integration => true do
                     "output" => {
                       "logstash" => {
                         "hosts" => ["#{host}:#{port}"],
-                        "tls" => { 
+                        "ssl" => {
                           "certificate_authorities" => certificate_authorities,
                           "certificate" => secondary_client_certificate_file,
-                          "certificate_key" => secondary_client_certificate_key_file
+                          "key" => secondary_client_certificate_key_file
                         }
                       },
                       "logging" => { "level" => "debug" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/1.1.33.Fork17/netty-tcnative-boringssl-static-1.1.33.Fork17.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.4/logstash-input-beats-3.1.4.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.5/logstash-input-beats-3.1.5.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)