fluent-plugin-mqtt-io 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436c90bc08f8b1c25114bbfd1974bd0ba3c07e70
-  data.tar.gz: 449febe8ba31c88d42735d59552c97b6761230e2
+  metadata.gz: a101da6ec1e37ea4d06abcdb86de0d197e9b3a61
+  data.tar.gz: 133378382d856ed7a71fed8d2ebb45da077d7091
 SHA512:
-  metadata.gz: d89f5f8e965131ad174c26581cfe75ae603ff6e310e4591184eaf2b0d066b020e522f88375db75f6a482c783289d71f61c39957c2037932cf9ad8b5f181eb023
-  data.tar.gz: 3afd42160d9329e3b1f9f380ac48f1e54e10e90aaa454e3ef9b931d57fc77d3c7176c364800a52d1cb39ed8bf0526dcd7970d69f0d9c72dfd97dd54c87b703c6
+  metadata.gz: 4257209a7c1dc3f66632c25cab3467c565bac14676d274fbc78430f1f8b9790c4c4e33777383ba489537ac20dccd085639b621483fe8391224a564c20cdc2233
+  data.tar.gz: 2704c441daa69f016a2486dffd3b70947b0e0077d5eb3fc45c36f62076acbafc3d2586c3c065d8fa93a8dba2986541e3c31a1fa6df24ed5f06be4d58ba5d1f40

data/README.md

@@ -68,7 +68,8 @@ Output Plugin can be used via match directive.
 
 The options are basically the same as Input Plugin. The difference is the following.
 
-- time_key: An attribute name used for timestamp field. Default is 'timestamp'.
+- time_key: An attribute name used for timestamp field genarated from fluentd time field. Default is nil (omitted).
+  If this option is omitted, timestamp field is not appended to the output record.
 - time_format: Output format of timestamp field. Default is ISO8601. You can specify your own format by using TimeParser.
 - topic_rewrite_pattern: Regexp pattern to extract replacement words from received topic or tag name
 - topic_rewrite_replacement: Topic name used for the publish using extracted pattern

data/fluent-plugin-mqtt-io.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mqtt-io"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 

data/lib/fluent/plugin/mqtt_output_mixin.rb

@@ -12,7 +12,7 @@ module Fluent
       base.config_param :ca_file, :string, :default => nil
       base.config_param :key_file, :string, :default => nil
       base.config_param :cert_file, :string, :default => nil
-      base.config_param :time_key, :string, :default => 'timestamp'
+      base.config_param :time_key, :string, :default => nil
       base.config_param :time_format, :string, :default => nil
       base.config_param :topic_rewrite_pattern, :string, :default => nil
       base.config_param :topic_rewrite_replacement, :string, :default => nil
@@ -72,6 +72,14 @@ module Fluent
       end
     end
 
+    def timestamp_hash(time)
+      if @time_key.nil?
+        {}
+      else
+        {@time_key => format_time(time)}
+      end
+    end
+
     def rewrite_tag(tag)
       if @topic_rewrite_pattern.nil?
         tag.gsub("\.", "/")

data/lib/fluent/plugin/out_mqtt.rb

@@ -10,7 +10,7 @@ module Fluent
     def emit(tag, es, chain)
       es.each {|time,record|
         $log.debug "#{tag}, #{format_time(time)}, #{record}"
-        @connect.publish(rewrite_tag(tag), record.merge(@time_key => format_time(time)).to_json)
+        @connect.publish(rewrite_tag(tag), record.merge(timestamp_hash(time)).to_json)
       }
       $log.flush
 

data/lib/fluent/plugin/out_mqtt_buf.rb

@@ -23,7 +23,7 @@ module Fluent
     def write(chunk)
       json = json_parse(chunk.read)
       $log.debug "#{json[0]}, #{format_time(json[1])}, #{json[2]}"
-      @connect.publish(rewrite_tag(json[0]), (json[2].merge(@time_key => format_time(json[1]))).to_json)
+      @connect.publish(rewrite_tag(json[0]), (json[2].merge(timestamp_hash(json[1]))).to_json)
       $log.flush
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mqtt-io
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: []
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler