logstash-input-kafka 5.0.4 → 5.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -0
  3. data/lib/logstash/inputs/kafka.rb +15 -10
  4. data/logstash-input-kafka.gemspec +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 10c63212aeba45448d69d530e933d3a22a47f51d
4
- data.tar.gz: 4255d1ce12ec042e3f6ead178d8f027e1f3a4ea0
3
+ metadata.gz: b1b7a40fda83cae37949a0f0ba0af1b0fc5d929c
4
+ data.tar.gz: e136107cf74d443b112d5e792b83143fa5acc6d9
5
5
  SHA512:
6
- metadata.gz: ca6ed5c61fced976d670826d7c37e368349ce80ca457d81f68a7d63987cfaa55833b37b1920bbe48a9cb6b5950d0ab4ae54b3913c8eeb89e18f79e9e4a781934
7
- data.tar.gz: b8459006846b01f123debd1777a02c761514d0b3277bed0242170e5e4537a1d2fa60651e41afc223ac28b01ab6b89522e0f4e5860a29a504ce1d85bf3cdaad89
6
+ metadata.gz: 8034561085a1156bcb0a577858ffa69e7d50aa2ca3e41526f7f3810d83ad7ac128979d88ccb63f141d01821c71d11c00354a91190e55ca26a6ba53d2deaa01eb
7
+ data.tar.gz: 8bfb557e53ee50659184aa5ab98d0833148900e5dff9b106be1d82c9a6a42ccc06191839ccdcf614408d50796a714b9412465c722bb571dd8bd02c29844fe016
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ ## 5.0.5
2
+ - place setup_log4j for logging registration behind version check
3
+
1
4
  ## 5.0.4
2
5
  - Update to Kafka version 0.10.0.1 for bug fixes
3
6
 
data/lib/logstash/inputs/kafka.rb CHANGED
@@ -7,20 +7,21 @@ require 'logstash-input-kafka_jars.rb'
7
7
  # This input will read events from a Kafka topic. It uses the the newly designed
8
8
  # 0.10 version of consumer API provided by Kafka to read messages from the broker.
9
9
  #
10
- # Here's a compatibility matrix that shows the Kafka broker and client versions that are compatible with each combination
10
+ # Here's a compatibility matrix that shows the Kafka client versions that are compatible with each combination
11
11
  # of Logstash and the Kafka input plugin:
12
12
  #
13
13
  # [options="header"]
14
14
  # |==========================================================
15
- # |Kafka Broker Version |Kafka Client Version |Logstash Version |Plugin Version |Why?
16
- # |0.8 |0.8 |2.0.0 - 2.x.x |<3.0.0 |Legacy, 0.8 is still popular
17
- # |0.9 |0.9 |2.0.0 - 2.3.x | 3.x.x |Works with the old Ruby Event API (`event['product']['price'] = 10`)
18
- # |0.9 |0.9 |2.4.0 - 5.0.x | 4.x.x |Works with the new getter/setter APIs (`event.set('[product][price]', 10)`)
19
- # |0.10 |0.10 |2.4.0 - 5.0.x | 5.x.x |Not compatible with the 0.9 broker
15
+ # |Kafka Client Version |Logstash Version |Plugin Version |Security Features |Why?
16
+ # |0.8 |2.0.0 - 2.x.x |<3.0.0 | |Legacy, 0.8 is still popular
17
+ # |0.9 |2.0.0 - 2.3.x | 3.x.x |Basic Auth, SSL |Works with the old Ruby Event API (`event['product']['price'] = 10`)
18
+ # |0.9 |2.4.0 - 5.0.x | 4.x.x |Basic Auth, SSL |Works with the new getter/setter APIs (`event.set('[product][price]', 10)`)
19
+ # |0.10 |2.4.0 - 5.0.x | 5.x.x |Basic Auth, SSL |Not compatible with the 0.9 broker
20
20
  # |==========================================================
21
21
  #
22
- # NOTE: It's a good idea to upgrade brokers before consumers/producers because brokers target backwards compatibility.
23
- # For example, the 0.9 broker will work with both the 0.8 consumer and 0.9 consumer APIs, but not the other way around.
22
+ # NOTE: We recommended that you use matching Kafka client and broker versions. During upgrades, you should
23
+ # upgrade brokers before clients because brokers target backwards compatibility. For example, the 0.9 broker
24
+ # is compatible with both the 0.8 consumer and 0.9 consumer APIs, but not the other way around.
24
25
  #
25
26
  # The Logstash Kafka consumer handles group management and uses the default offset management
26
27
  # strategy using Kafka topics.
@@ -165,7 +166,11 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
165
166
 
166
167
  public
167
168
  def register
168
- LogStash::Logger.setup_log4j(@logger)
169
+ # Logstash 2.4
170
+ if defined?(LogStash::Logger) && LogStash::Logger.respond_to?(:setup_log4j)
171
+ LogStash::Logger.setup_log4j(@logger)
172
+ end
173
+
169
174
  @runner_threads = []
170
175
  end # def register
171
176
 
@@ -259,7 +264,7 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
259
264
 
260
265
  org.apache.kafka.clients.consumer.KafkaConsumer.new(props)
261
266
  rescue => e
262
- logger.error("Unable to create Kafka consumer from given configuration", :kafka_error_message => e)
267
+ @logger.error("Unable to create Kafka consumer from given configuration", :kafka_error_message => e)
263
268
  throw e
264
269
  end
265
270
  end
data/logstash-input-kafka.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-input-kafka'
3
- s.version = '5.0.4'
3
+ s.version = '5.0.5'
4
4
  s.licenses = ['Apache License (2.0)']
5
5
  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'
6
6
  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 CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-kafka
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.4
4
+ version: 5.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elasticsearch
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-19 00:00:00.000000000 Z
11
+ date: 2016-09-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement