fluent-plugin-beats 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf1984c54ddbc5ba2441f91e5ff771b6a6d0a73
-  data.tar.gz: 6f19cce2725f173f5df2df64f83bfdc7d1385ec2
+  metadata.gz: 7afa3e6515497fdece40f76d74950bff9c55ca20
+  data.tar.gz: 4bc784e37dc7de31d5713100c65188cee033cc7b
 SHA512:
-  metadata.gz: f332addefaad67cca65ad060aa79399962133cd0dbb770951ef6693221bd2db4276e4478777f3ec1043047762306b2b70c0bc8a15879bd3201e305cad2fdc1ee
-  data.tar.gz: f05e0c59953dc0ccdef6365bebba98ff4c5356046a226692b60e8e25fe70c7d64117a8d8858118de89e21ab9de85ff341c3616866a4c777936e47b3799838d7a
+  metadata.gz: 26ebbf0966bcb09a36926137ddd6f0d88eee62da864eb4c36b9a1255877ac5f0037199b1d9ea611f5ca1aa297a82e8107bbf5fb1e6f7fff5dcb03b934863ad74
+  data.tar.gz: 913be723f4ed8deb4ed19308b6aa8fd680237a21f703dca6ccf9cda63fe084de4ec0dd6c7f95614edd48fd61b3e0da734a59ce3667ad224d2762021a9436109b

data/README.md

@@ -58,7 +58,7 @@ Configuration example:
 
   Limit the number of connections from beat instances. Default is unlimited.
 
-**use_ssl**, **ssl_certificate**, **ssl_key**, **ssl_key_passphrase**
+**use_ssl**, **ssl_certificate**, **ssl_key**, **ssl_key_passphrase**, **ssl_version**, **ssl_ciphers**
 
   For lumberjack protocol.
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/fluent/plugin/in_beats.rb

@@ -42,6 +42,8 @@ module Fluent::Plugin
     config_param :ssl_certificate, :string, :default => nil
     config_param :ssl_key, :string, :default => nil
     config_param :ssl_key_passphrase, :string, :default => nil
+    config_param :ssl_version, :string, :default => nil
+    config_param :ssl_ciphers, :string, :default => nil
 
     config_section :parse do
       config_set_default :@type, DEFAULT_PARSER
@@ -75,7 +77,7 @@ module Fluent::Plugin
 
       @lumberjack = Lumberjack::Beats::Server.new(
         :address => @bind, :port => @port, :ssl => @use_ssl, :ssl_certificate => @ssl_certificate,
-        :ssl_key => @ssl_key, :ssl_key_passphrase => @ssl_key_passphrase)
+        :ssl_key => @ssl_key, :ssl_key_passphrase => @ssl_key_passphrase, :ssl_version => @ssl_version, :ssl_ciphers => @ssl_ciphers)
       # Lumberjack::Beats::Server depends on normal accept so we need to launch thread for each connection.
       # TODO: Re-implement Beats Server with Cool.io for resource control
       @thread_pool = Concurrent::CachedThreadPool.new(:idletime => 15) # idletime setting is based on logstash beats input

data/lib/lumberjack/beats/server.rb

@@ -29,7 +29,9 @@ module Lumberjack module Beats
         :ssl => true,
         :ssl_certificate => nil,
         :ssl_key => nil,
-        :ssl_key_passphrase => nil
+        :ssl_key_passphrase => nil,
+        :ssl_version => nil,
+        :ssl_ciphers => nil,
       }.merge(options)
 
       if @options[:ssl]
@@ -51,6 +53,12 @@ module Lumberjack module Beats
       if @options[:ssl]
         # load SSL certificate
         @ssl = OpenSSL::SSL::SSLContext.new
+        if @options[:ssl_version]
+          @ssl.ssl_version = @options[:ssl_version]
+        end
+        if @options[:ssl_ciphers]
+          @ssl.ciphers = @options[:ssl_ciphers]
+        end
         @ssl.cert = OpenSSL::X509::Certificate.new(File.read(@options[:ssl_certificate]))
         @ssl.key = OpenSSL::PKey::RSA.new(File.read(@options[:ssl_key]),
           @options[:ssl_key_passphrase])

data/test/plugin/test_in_beats.rb

@@ -36,6 +36,18 @@ class BeatsInputTest < Test::Unit::TestCase
     assert_equal PORT, d.instance.port
     assert_equal '127.0.0.1', d.instance.bind
     assert_equal 'test.beats', d.instance.tag
+    assert_false d.instance.use_ssl
+    assert_nil d.instance.ssl_certificate
+    assert_nil d.instance.ssl_key
+    assert_nil d.instance.ssl_key_passphrase
+    assert_nil d.instance.ssl_version
+    assert_nil d.instance.ssl_ciphers
+  end
+
+  def test_configure_without_tag_parameters
+    assert_raise Fluent::ConfigError.new("'tag' or 'metadata_as_tag' parameter is required on beats input") do
+      create_driver('')
+    end
   end
 
   def test_send_beat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-beats
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd