fluent-plugin-kafka 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba39ffa7fe26f17e105ea227d72be24796dd751
-  data.tar.gz: b56e6e521aeeffadb78c48ce041de214a6c4d673
+  metadata.gz: 7e0fc15b5eb42956e24bc2ba3c28d68a0e871cd8
+  data.tar.gz: b4b6c74aaf766a9df5f070f92d51a18f91da3b83
 SHA512:
-  metadata.gz: 3489e648c43e82d9c2c67eaa933801014d6553c2df13cea6839a42b707d5d154765532f19a8620dcf1a95479513165d136874feb6a4729f53dda0aa04f389f31
-  data.tar.gz: 7e2b3d89558211394dfe6d2e32a865e5ed469e459f9756434b7fdbca59bd9ac31f520e3d52d17aa37cdd1c21a9fefceb34a5d632198a448479a5957ea6f52962
+  metadata.gz: 40117591351866c8bdd669574d507ca663cc5a99acd206d6efb1c881c245e1fa5f13e61c3498fb73e987ef1d7eb71fa3654b846d9d3cb6af7b08b36e9befb3dc
+  data.tar.gz: 3fd29b50927e56cec350d2e3a694903c6f1243c1bd8f32e8cae66b56c92b55a8237df89a078ed1a8838bb346377d3200f296127efe299ea7ae4e5407c8e28f67

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.9.1 - 2019/03/25
+
+	* output: Support sasl_over_ssl parameter
+	* Support ruby-kafka 0.7.6
+
 Release 0.9.0 - 2019/02/22
 
 	* Add v1 API based rdkafka2 output plugin

data/fluent-plugin-kafka.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-kafka"
   gem.require_paths = ["lib"]
-  gem.version       = '0.9.0'
+  gem.version       = '0.9.1'
   gem.required_ruby_version = ">= 2.1.0"
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]

data/lib/fluent/plugin/kafka_plugin_util.rb

@@ -17,6 +17,19 @@ module Fluent
         }
       end
 
+      DummyFormatter = Object.new
+
+      def start
+        super
+
+        # This is bad point here but easy to fix for all kafka plugins
+        unless log.respond_to?(:formatter)
+          def log.formatter
+            Fluent::KafkaPluginUtil::SSLSettings::DummyFormatter
+          end
+        end
+      end
+
       def read_ssl_file(path)
         return nil if path.nil?
 

data/lib/fluent/plugin/out_kafka.rb

@@ -112,7 +112,7 @@ DESC
         elsif @username != nil && @password != nil
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),
                              ssl_client_cert: read_ssl_file(@ssl_client_cert), ssl_client_cert_key: read_ssl_file(@ssl_client_cert_key), ssl_ca_certs_from_system: @ssl_ca_certs_from_system,
-                             sasl_plain_username: @username, sasl_plain_password: @password)
+                             sasl_plain_username: @username, sasl_plain_password: @password, sasl_over_ssl: @sasl_over_ssl)
         else
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),
                              ssl_client_cert: read_ssl_file(@ssl_client_cert), ssl_client_cert_key: read_ssl_file(@ssl_client_cert_key), ssl_ca_certs_from_system: @ssl_ca_certs_from_system,

data/lib/fluent/plugin/out_kafka2.rb

@@ -91,7 +91,7 @@ DESC
         elsif @username != nil && @password != nil
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, logger: logger, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),
                              ssl_client_cert: read_ssl_file(@ssl_client_cert), ssl_client_cert_key: read_ssl_file(@ssl_client_cert_key), ssl_client_cert_chain: read_ssl_file(@ssl_client_cert_chain),
-                             ssl_ca_certs_from_system: @ssl_ca_certs_from_system, sasl_plain_username: @username, sasl_plain_password: @password)
+                             ssl_ca_certs_from_system: @ssl_ca_certs_from_system, sasl_plain_username: @username, sasl_plain_password: @password, sasl_over_ssl: @sasl_over_ssl)
         else
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, logger: logger, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),
                              ssl_client_cert: read_ssl_file(@ssl_client_cert), ssl_client_cert_key: read_ssl_file(@ssl_client_cert_key), ssl_client_cert_chain: read_ssl_file(@ssl_client_cert_chain),

data/lib/fluent/plugin/out_kafka_buffered.rb

@@ -135,7 +135,7 @@ DESC
         elsif @username != nil && @password != nil
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, logger: logger, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),
                              ssl_client_cert: read_ssl_file(@ssl_client_cert), ssl_client_cert_key: read_ssl_file(@ssl_client_cert_key), ssl_ca_certs_from_system: @ssl_ca_certs_from_system,
-                             sasl_plain_username: @username, sasl_plain_password: @password)
+                             sasl_plain_username: @username, sasl_plain_password: @password, sasl_over_ssl: @sasl_over_ssl)
         else
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, logger: logger, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),
                              ssl_client_cert: read_ssl_file(@ssl_client_cert), ssl_client_cert_key: read_ssl_file(@ssl_client_cert_key), ssl_ca_certs_from_system: @ssl_ca_certs_from_system,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Hidemasa Togashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd