fluent-plugin-kafka 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa29645a4c13d7400459f16cbf7720e3bf8a3cc
-  data.tar.gz: 56a4b88bbfc9f42efe9f87bc845552bc17b1f019
+  metadata.gz: 7dd4c51d1a923bc770c5c5a0a57778c573e0a042
+  data.tar.gz: e55b05ba6214d79a4020ac505b535ca618d8355e
 SHA512:
-  metadata.gz: 13253507831d6f1e07e0937f3b4d01e01ffa2ea60605ad3cb1c326f3a4606c3a1173d07d3688250b8866ae3a20a69662c05e688ba746cc677c448a643082e528
-  data.tar.gz: 4fb3eb6ed6ffd61b12efa4e8da930a573b5420a4681885a66b54c9052a5907bc39ad6c17d6d65d7aefaa9f8546fe8453cee199ad52a48a1d4a799636b8f0165f
+  metadata.gz: 9b659a098b6c7ec810434a6c0db350c01992d419c0809862eb705346cb1035b19adf6c73c45fff121ce764b38a84df6c29688cc090b9157f31264975b0c20f0b
+  data.tar.gz: 2be308b6ab267b1cc0e73f38b728d6d6fd94c59c6c30069562e55dc72f3e0752762d14506e315d5d094d8b4dbbc719b1960b40c091609a5262aabcac9a527658

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.8.1 - 2018/11/20
+
+	* input: Support SASL without SSL
+
 Release 0.8.0 - 2018/10/18
 
 	* output: Support SASL without SSL

data/README.md

@@ -41,12 +41,25 @@ If you want to use zookeeper related parameters, you also need to install zookee
 
 Set path to SSL related files. See [Encryption and Authentication using SSL](https://github.com/zendesk/ruby-kafka#encryption-and-authentication-using-ssl) for more detail.
 
-#### SASL authentication
+#### SASL authentication 
+
+##### with GSSAPI
 
 - principal
 - keytab
 
-Set principal and path to keytab for SASL/GSSAPI authentication. See [Authentication using SASL](https://github.com/zendesk/ruby-kafka#authentication-using-sasl) for more details.
+Set principal and path to keytab for SASL/GSSAPI authentication. 
+See [Authentication using SASL](https://github.com/zendesk/ruby-kafka#authentication-using-sasl) for more details.
+
+##### with Plain/SCRAM
+
+- username
+- password
+- scram_mechanism
+- sasl_over_ssl
+
+Set username, password, scram_mechanism and sasl_over_ssl for SASL/Plain or Scram authentication. 
+See [Authentication using SASL](https://github.com/zendesk/ruby-kafka#authentication-using-sasl) for more details.
 
 ### Input plugin (@type 'kafka')
 

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.8.0'
+  gem.version       = '0.8.1'
   gem.required_ruby_version = ">= 2.1.0"
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]

data/lib/fluent/plugin/in_kafka.rb

@@ -20,6 +20,8 @@ class Fluent::KafkaInput < Fluent::Input
   config_param :topics, :string, :default => nil,
                :desc => "Listening topics(separate with comma',')"
   config_param :client_id, :string, :default => 'kafka'
+  config_param :sasl_over_ssl, :bool, :default => true,
+               :desc => "Set to false to prevent SSL strict mode when using SASL authentication"
   config_param :partition, :integer, :default => 0,
                :desc => "Listening partition"
   config_param :offset, :integer, :default => -1,
@@ -177,7 +179,7 @@ class Fluent::KafkaInput < Fluent::Input
       @kafka = Kafka.new(seed_brokers: @brokers, client_id: @client_id, logger: log, 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_scram_username: @username, sasl_scram_password: @password,
-                         sasl_scram_mechanism: @scram_mechanism)
+                         sasl_scram_mechanism: @scram_mechanism, sasl_over_ssl: @sasl_over_ssl)
     elsif @username != nil && @password != nil
       @kafka = Kafka.new(seed_brokers: @brokers, client_id: @client_id, logger: log, 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),

data/lib/fluent/plugin/in_kafka_group.rb

@@ -12,6 +12,8 @@ class Fluent::KafkaGroupInput < Fluent::Input
   config_param :topics, :string,
                :desc => "Listening topics(separate with comma',')."
   config_param :client_id, :string, :default => 'kafka'
+  config_param :sasl_over_ssl, :bool, :default => true,
+               :desc => "Set to false to prevent SSL strict mode when using SASL authentication"
   config_param :format, :string, :default => 'json',
                :desc => "Supported format: (json|text|ltsv|msgpack)"
   config_param :message_key, :string, :default => 'message',
@@ -153,7 +155,7 @@ class Fluent::KafkaGroupInput < Fluent::Input
       @kafka = Kafka.new(seed_brokers: @brokers, client_id: @client_id, logger: log, 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_scram_username: @username, sasl_scram_password: @password,
-                         sasl_scram_mechanism: @scram_mechanism)
+                         sasl_scram_mechanism: @scram_mechanism, sasl_over_ssl: @sasl_over_ssl)
     elsif @username != nil && @password != nil
       @kafka = Kafka.new(seed_brokers: @brokers, client_id: @client_id, logger: log, 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),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Hidemasa Togashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd