roched-fluent-plugin-kafka 0.6.14 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb3cccd8f6b9f035023628470aee2f1488f91a3
-  data.tar.gz: e1e3498b0280cfbe42aa081a6ae222f104117661
+  metadata.gz: 544f9c48800e1cc931c85b49ff4585be1e72610f
+  data.tar.gz: 3bf999a47c527b3b88c3b9a627273438a196b2da
 SHA512:
-  metadata.gz: 430e719d9a8ec05c7933f0d629b51dbdb6c8241797cc6cc497501062771df150f21e35d09baf7a4f7bb24fd5627569360ebec07791101177eb6b3e16f91e6a6c
-  data.tar.gz: c889be62bf5ec109e3d2c318c1d07d3f2bd566b6b6e0a718504624309e48d506690796e995c62967392614ea188b15f60358ab14fafb1c70c15f26d96779628c
+  metadata.gz: 04e8eadd86cc9abdeedc7ef64526f20f76f3bc970cf2fe9419165da112f90cf9f0c316443f499ed1175125f76799a4509f40a1d7b5f01435e1d96e3679d52add
+  data.tar.gz: d6b7bf879022d14f5ac5c243c258b530bda257d07ac26be0e15238b2587b807490396814511d61997d8958ca9b22fb36fb87316796de0c1840667e3673a773fe

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          = "roched-fluent-plugin-kafka"
   gem.require_paths = ["lib"]
-  gem.version       = '0.6.14'
+  gem.version       = '0.6.15'
   gem.required_ruby_version = ">= 2.1.0"
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]

data/lib/fluent/plugin/out_kafka_buffered.rb

@@ -112,9 +112,23 @@ DESC
     begin
       if @seed_brokers.length > 0
         logger = @get_kafka_client_log ? log : 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),
-                           sasl_gssapi_principal: @principal, sasl_gssapi_keytab: @keytab)
+        log.warn "user #{@username} pwd #{@password}"
+        if @scram_mechanism != nil && @username != nil && @password != nil
+          log.warn "using scram authentication"
+          @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),
+                             sasl_scram_username: @username, sasl_scram_password: @password, sasl_scram_mechanism: @scram_mechanism)
+        elsif @username != nil && @password != nil
+          log.warn "using plain authentication"
+          @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),
+                             sasl_plain_username: @username, sasl_plain_password: @password)
+        else
+          log.warn "no auth"
+          @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),
+                             sasl_gssapi_principal: @principal, sasl_gssapi_keytab: @keytab)
+        end
         log.info "initialized kafka producer: #{@client_id}"
       else
         log.warn "No brokers found on Zookeeper"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roched-fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
 platform: ruby
 authors:
 - Hidemasa Togashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd