fluent-plugin-kafka 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 12a2ab7f1bc8e9e7f247ac97f4a06876ff19ac0d
-  data.tar.gz: e6a057a23d7a022ea73e668edb3665d01b22f93f
+SHA256:
+  metadata.gz: 3700ac3c6331871e2aedab749485af0a85da5036516a529d648dae8a7a6b9b15
+  data.tar.gz: 3e228b9f8434435b19a46756a040a9103fff106ffcafbc3c2dfec186d6c3e619
 SHA512:
-  metadata.gz: a6371e08ebba396eb95dfcd1d88bb42ddc879ad3b45fb1d4e7a4d60a75436e125afdc81408328c19402db4bf232c99bbf2a48b1190756064642c085d25391b6c
-  data.tar.gz: c09f9e01261b4da1d8881c8eeb08bf5ce940358dff3f346ae4794ee93e2b6c113ad6156eee18eba1567f9247cdb36d28751a30b6504e15e15273e82c5c511ce0
+  metadata.gz: 26f9ecd9b37070352a23f9e689bf2ad36a830934953e5def18cd4e1097fa3e38145f67bf9ab43a5e4b4d10aa410e07e0de0b143f6a30154c21e287176a599050
+  data.tar.gz: fe61f987f8190529a2b7a3dfd40be7dfe97d30e44cb1274668b6f8a9216d9a0d43453bcf299ceeb5e9d45a7e10f46e1f3e2bd127b5644f812e3886d217034c53

data/.travis.yml

@@ -5,8 +5,11 @@ rvm:
   - 2.2
   - 2.3.1
   - 2.4.1
+  - 2.5.0
   - ruby-head
 
+before_install:
+  - gem update --system
 script:
   - bundle exec rake test
 

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.7.3 - 2018/05/30
+
+	* output: Use SSL endpoint when ssl_client_cert is true
+
 Release 0.7.2 - 2018/03/12
 
 	* output: Fix the regression of get_kafka_client_log parameter

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

data/lib/fluent/plugin/kafka_plugin_util.rb

@@ -22,6 +22,12 @@ module Fluent
           File.read(path)
         end
       end
+
+      def pickup_ssl_endpoint(node)
+        ssl_endpoint = node['endpoints'].find {|e| e.start_with?('SSL')}
+        raise 'no SSL endpoint found on Zookeeper' unless ssl_endpoint
+        return [URI.parse(ssl_endpoint).host, URI.parse(ssl_endpoint).port].join(':')
+      end
     end
 
     module SaslSettings

data/lib/fluent/plugin/out_kafka.rb

@@ -90,7 +90,11 @@ DESC
       z = Zookeeper.new(@zookeeper)
       z.get_children(:path => @zookeeper_path)[:children].each do |id|
         broker = Yajl.load(z.get(:path => @zookeeper_path + "/#{id}")[:data])
-        @seed_brokers.push("#{broker['host']}:#{broker['port']}")
+        if @ssl_client_cert
+          @seed_brokers.push(pickup_ssl_endpoint(broker))
+        else
+          @seed_brokers.push("#{broker['host']}:#{broker['port']}")
+        end
       end
       z.close
       log.info "brokers has been refreshed via Zookeeper: #{@seed_brokers}"

data/lib/fluent/plugin/out_kafka_buffered.rb

@@ -111,7 +111,11 @@ DESC
       z = Zookeeper.new(@zookeeper)
       z.get_children(:path => @zookeeper_path)[:children].each do |id|
         broker = Yajl.load(z.get(:path => @zookeeper_path + "/#{id}")[:data])
-        @seed_brokers.push("#{broker['host']}:#{broker['port']}")
+        if @ssl_client_cert
+          @seed_brokers.push(pickup_ssl_endpoint(broker))
+        else
+          @seed_brokers.push("#{broker['host']}:#{broker['port']}")
+        end
       end
       z.close
       log.info "brokers has been refreshed via Zookeeper: #{@seed_brokers}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Hidemasa Togashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin for Apache Kafka > 0.8