fluent-plugin-kafka 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea8e8c26bed79cf08bcf26e11213a6aec0757741
-  data.tar.gz: 40df9fd993cd1f5daf1f7f10331c2370986df549
+  metadata.gz: a72f6359b8397411999429eeda7366e05114e925
+  data.tar.gz: b8dc3a2860a941b43d02f8a98562eec997bd065f
 SHA512:
-  metadata.gz: f360beef321eeee7dc4dec739d3386e205bf81878ef8777e1970aee147f681dcf930b345efb46bc5a5bdf037caab07ea1a6f7a0abbec21e70581e44c32fb44b9
-  data.tar.gz: 89b381653212a2a4ac66e69df57033f80206d3e2d6c5c48bc4bb5653e548c4a1f61aa85a7427703a30e544c1de429d0457fd1dfd12ea798a81ae13b824813952
+  metadata.gz: 6af36d8001d89b0b7b181118f66b6a38f3f4a567e70d4a744e3e69496c00a84939f9272aabba9650bf02ee57fe00113b6ca3782b674a20fa108e8892f8f00e81
+  data.tar.gz: c5a8f2ad75696645cd62a40cc0aad87f471a59119d73fbf04c2be8b0d68d195e33cfb9c2b82afa61312dc2d1160de91182a64686213fec15b37ae725dfbcd043

data/README.md

@@ -27,6 +27,7 @@ Or install it yourself as:
       port   <broker port: default=9092>
       topics <listening topics(separate with comma',')>
       format <input text type (text|json|ltsv|msgpack)>
+      message_key <key (Optional, for text format only, default is message)>
       add_prefix <tag prefix (Optional)>
       add_suffix <tag suffix (Optional)>
       max_bytes           (integer)    :default => nil (Use default of Poseidon)

data/fluent-plugin-kafka.gemspec

@@ -12,7 +12,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.0.15'
+  gem.version = '0.0.16'
   gem.add_dependency 'fluentd'
   gem.add_dependency 'poseidon'
   gem.add_dependency 'ltsv'

data/lib/fluent/plugin/in_kafka.rb

@@ -4,6 +4,7 @@ class KafkaInput < Input
   Plugin.register_input('kafka', self)
 
   config_param :format, :string, :default => 'json' # (json|text|ltsv)
+  config_param :message_key, :string, :default => 'message' # for 'text' format only
   config_param :host, :string, :default => 'localhost'
   config_param :port, :integer, :default => 9092
   config_param :interval, :integer, :default => 1 # seconds
@@ -51,7 +52,7 @@ class KafkaInput < Input
     opt[:socket_timeout_ms] = @socket_timeout_ms if @socket_timeout_ms
 
     @topic_watchers = @topic_list.map {|topic|
-      TopicWatcher.new(topic, @host, @port, @client_id, @partition, @offset, interval, @format, @add_prefix, @add_suffix, opt)
+      TopicWatcher.new(topic, @host, @port, @client_id, @partition, @offset, interval, @format, @message_key, @add_prefix, @add_suffix, opt)
     }
     @topic_watchers.each {|tw|
       tw.attach(@loop)
@@ -71,10 +72,11 @@ class KafkaInput < Input
   end
 
   class TopicWatcher < Coolio::TimerWatcher
-    def initialize(topic, host, port, client_id, partition, offset, interval, format, add_prefix, add_suffix, options={})
+    def initialize(topic, host, port, client_id, partition, offset, interval, format, message_key, add_prefix, add_suffix, options={})
       @topic = topic
       @callback = method(:consume)
       @format = format
+      @message_key = message_key
       @add_prefix = add_prefix
       @add_suffix = add_suffix
       @consumer = Poseidon::PartitionConsumer.new(
@@ -128,7 +130,7 @@ class KafkaInput < Input
       when 'msgpack'
         parsed_record = MessagePack.unpack(record)
       when 'text'
-        parsed_record = record
+        parsed_record[@message_key] = record
       end
       parsed_record
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Hidemasa Togashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd