logstash-input-kafka 5.1.1 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d92524fd295d4a6ffd3ba609b2ac7a1e6e14af0
-  data.tar.gz: 5b4beb616716241b5a158eab18918058a636a088
+  metadata.gz: 23b0e120f102a1543bdfc0a3ff8926ca7dc39b2e
+  data.tar.gz: 0f8f33f6acde6b199930ce593a25b3760eec5b39
 SHA512:
-  metadata.gz: 842f5bb2fe9f9bc78679b5837162fdc957ee698f80814436a2a3ba0de441d25327da83d6803b7b926333b06e4915adce4fa669fbf6d742000910867561e93425
-  data.tar.gz: 0f7963d93ac071e45074c1b7470db0fa74e56089814f4625b73899cc0d676ff891117c68abba6b05fb363359808a4a3d593cd639c380b3473bf877fdb0bdbd52
+  metadata.gz: 4dc52455f4321c4fe64cf86ad8ca1bcc7f18e97dc495214ec48870b0605f86d81dc7a524bb7587f504cb0ed132b6f3816f3aae57272c92f4054cc31f5d368253
+  data.tar.gz: bdf7b3bc93b1c108afeca28342cd51301aa9921b6145d95296423f690f8770704b845aab9db328b357994015d68aaee3d1abfaf30ccf681f6a33a821e8cb2e04

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 5.1.3
+  - Make error reporting clearer when connection fails
+  - set kerberos only when using GSSAPI
+
+## 5.1.2
+  - Docs: Move info about security features out of the compatibility matrix and into the main text.
+ 
 ## 5.1.1
   - Docs: Clarify compatibility matrix and remove it from the changelog to avoid duplication.
   

data/lib/logstash/inputs/kafka.rb

@@ -4,25 +4,32 @@ require 'stud/interval'
 require 'java'
 require 'logstash-input-kafka_jars.rb'
 
-# This input will read events from a Kafka topic. It uses the the newly designed
-# 0.10 version of consumer API provided by Kafka to read messages from the broker.
+# This input will read events from a Kafka topic. It uses the 0.10 version of the
+# consumer API provided by Kafka to read messages from the broker.
 #
 # Here's a compatibility matrix that shows the Kafka client versions that are compatible with each combination
 # of Logstash and the Kafka input plugin: 
 # 
 # [options="header"]
 # |==========================================================
-# |Kafka Client Version |Logstash Version |Plugin Version |Security Features |Why?
-# |0.8       |2.0.0 - 2.x.x   |<3.0.0 | |Legacy, 0.8 is still popular 
-# |0.9       |2.0.0 - 2.3.x   | 3.x.x |SSL |Works with the old Ruby Event API (`event['product']['price'] = 10`)  
-# |0.9       |2.4.x - 5.x.x   | 4.x.x |SSL |Works with the new getter/setter APIs (`event.set('[product][price]', 10)`)
-# |0.10.0.x  |2.4.x - 5.x.x   | 5.x.x |SSL |Not compatible with the <= 0.9 broker
+# |Kafka Client Version |Logstash Version |Plugin Version |Why?
+# |0.8       |2.0.0 - 2.x.x   |<3.0.0 |Legacy, 0.8 is still popular 
+# |0.9       |2.0.0 - 2.3.x   | 3.x.x |Works with the old Ruby Event API (`event['product']['price'] = 10`)  
+# |0.9       |2.4.x - 5.x.x   | 4.x.x |Works with the new getter/setter APIs (`event.set('[product][price]', 10)`)
+# |0.10.0.x  |2.4.x - 5.x.x   | 5.x.x |Not compatible with the <= 0.9 broker
 # |==========================================================
 # 
 # NOTE: We recommended that you use matching Kafka client and broker versions. During upgrades, you should
 # upgrade brokers before clients because brokers target backwards compatibility. For example, the 0.9 broker
 # is compatible with both the 0.8 consumer and 0.9 consumer APIs, but not the other way around.
 #
+# This input supports connecting to Kafka over:
+#
+# * SSL (requires plugin version 3.0.0 or later)
+# * Kerberos SASL (requires plugin version 5.1.0 or later) 
+#
+# By default security is disabled but can be turned on as needed.
+#
 # The Logstash Kafka consumer handles group management and uses the default offset management
 # strategy using Kafka topics.
 #
@@ -39,9 +46,6 @@ require 'logstash-input-kafka_jars.rb'
 #
 # Kafka consumer configuration: http://kafka.apache.org/documentation.html#consumerconfigs
 #
-# This version also adds support for SSL/TLS security connection to Kafka. By default SSL is
-# disabled but can be turned on as needed.
-#
 class LogStash::Inputs::Kafka < LogStash::Inputs::Base
   config_name 'kafka'
 
@@ -299,7 +303,9 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
 
       org.apache.kafka.clients.consumer.KafkaConsumer.new(props)
     rescue => e
-      @logger.error("Unable to create Kafka consumer from given configuration", :kafka_error_message => e)
+      logger.error("Unable to create Kafka consumer from given configuration",
+                   :kafka_error_message => e,
+                   :cause => e.respond_to?(:getCause) ? e.getCause() : nil)
       throw e
     end
   end
@@ -323,8 +329,9 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
     props.put("sasl.mechanism",sasl_mechanism)
     if sasl_mechanism == "GSSAPI" && sasl_kerberos_service_name.nil?
       raise LogStash::ConfigurationError, "sasl_kerberos_service_name must be specified when SASL mechanism is GSSAPI"
+    elsif sasl_mechanism == "GSSAPI"
+      props.put("sasl.kerberos.service.name",sasl_kerberos_service_name)
     end
-
-    props.put("sasl.kerberos.service.name",sasl_kerberos_service_name)
+    
   end
 end #class LogStash::Inputs::Kafka

data/logstash-input-kafka.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-kafka'
-  s.version         = '5.1.1'
+  s.version         = '5.1.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = 'This input will read events from a Kafka topic. It uses the high level consumer API provided by Kafka to read messages from the broker'
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-kafka
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.3
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement