From dd4bb4496ec5637ecade162381b220f429f34859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20Quintana?= Date: Wed, 25 Jan 2017 21:27:33 +0100 Subject: [PATCH 1/2] Add security.protocol=SSL when ssl is true --- lib/logstash/outputs/kafka.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/logstash/outputs/kafka.rb b/lib/logstash/outputs/kafka.rb index 94ebff1..3f93d94 100644 --- a/lib/logstash/outputs/kafka.rb +++ b/lib/logstash/outputs/kafka.rb @@ -208,6 +208,9 @@ def close private def create_producer begin + # For backward compatibility + security_protocol = "SSL" if ssl + props = java.util.Properties.new kafka = org.apache.kafka.clients.producer.ProducerConfig @@ -229,7 +232,7 @@ def create_producer props.put("security.protocol", security_protocol) unless security_protocol.nil? - if security_protocol == "SSL" || ssl + if security_protocol == "SSL" set_trustore_keystore_config(props) elsif security_protocol == "SASL_PLAINTEXT" set_sasl_config(props) From c0d7d9b692be622cc06ff02be7b57ad0a0876442 Mon Sep 17 00:00:00 2001 From: Gerald Quintana Date: Thu, 26 Jan 2017 09:47:24 +0100 Subject: [PATCH 2/2] Don't overwrite security_protocol when set --- lib/logstash/outputs/kafka.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/logstash/outputs/kafka.rb b/lib/logstash/outputs/kafka.rb index 3f93d94..c46062f 100644 --- a/lib/logstash/outputs/kafka.rb +++ b/lib/logstash/outputs/kafka.rb @@ -209,7 +209,7 @@ def close def create_producer begin # For backward compatibility - security_protocol = "SSL" if ssl + security_protocol = "SSL" if ssl and security_protocol.nil? props = java.util.Properties.new kafka = org.apache.kafka.clients.producer.ProducerConfig