fluent-plugin-influxdb 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2043134621024be6c56a137fd6e8a1c9049541c
-  data.tar.gz: c35031b1346f574647e69bd764196eae535c6a34
+  metadata.gz: f0e1211e313f744ceecfb57ec8a21f22715569b2
+  data.tar.gz: be8470752389e6369cc5860695d127691fc55939
 SHA512:
-  metadata.gz: 732a45ad107758908151104d839e7dd39eaa161cce9f3db2cae35935d58f3f292912bdff5898f3106cc8d648b0fc765c663ebe7c6c42a4f8f9a77e9c8ea7df73
-  data.tar.gz: 56b46a92c366c8695525f7fe8124c8b19eba9a87f4b849fa043de1b7a3b56dc0a3567b164195764cba6f2696e37fbf3de467b256aa8791b7c55240cad3a43d92
+  metadata.gz: 0241c72b998cf7df9e9ad341ef9385d74d511ede88598056c5edfa90f17f90d0c68dab2b77fc3f35ec6696a1bee99fa83a7dfb8239a773eba9b39bf2d7689760
+  data.tar.gz: 96511394b68b23bd8daad5e2bc3489bd7757bb1118739012b5d84b6256f7f86af65e419774d82d57e17bf1f3afb91803ce8bdda26fba41952aa46877811d3417

data/History.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.3.0 (Dec, 15, 2016)
+=====
+
+- Skip events which contains only tags
+- Fix error handling for v1.0 client
+- Adjust timestamp based on precision
+
 0.2.8 (July, 06, 2016)
 =====
 

data/README.md

@@ -41,11 +41,15 @@ Just like other regular output plugins, Use type `influxdb` in your fluentd conf
 
 `password`: The password of the user, default to "root"
 
+`retry`: The finite number of retry times. default is infinite
+
 `use_ssl`: Use SSL when connecting to influxDB. default to false
 
 `verify_ssl`: Enable/Disable SSL Certs verification when connecting to influxDB via SSL. default to true
 
-`time_precision`: The time precision of timestamp. default to "s". should specify either hour (h), minutes (m), second (s), millisecond (ms), microsecond (u), or nanosecond (n)
+`time_key`: Use value of this tag if it exists in event instead of event timestamp
+
+`time_precision`: The time precision of timestamp. default to "s". should specify either hour (h), minutes (m), second (s), millisecond (ms), microsecond (u), or nanosecond (ns)
 
 `tag_keys`: The names of the keys to use as influxDB tags.
 

data/fluent-plugin-influxdb.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = "fluent-plugin-influxdb"
-  s.version       = '0.2.8'
+  s.version       = '0.3.0'
   s.authors       = ["Masahiro Nakagawa", "FangLi"]
   s.email         = ["repeatedly@gmail.com", "surivlee@gmail.com"]
   s.description   = %q{InfluxDB output plugin for Fluentd}

data/lib/fluent/plugin/out_influxdb.rb

@@ -30,7 +30,7 @@ DESC
                :desc => <<-DESC
 The time precision of timestamp.
 You should specify either hour (h), minutes (m), second (s),
-millisecond (ms), microsecond (u), or nanosecond (n).
+millisecond (ms), microsecond (u), or nanosecond (ns).
 DESC
   config_param :use_ssl, :bool, :default => false,
                :desc => "Use SSL when connecting to influxDB."
@@ -57,6 +57,7 @@ DESC
 
   def configure(conf)
     super
+    @time_precise = time_precise_lambda()
   end
 
   def start
@@ -80,7 +81,7 @@ DESC
       unless existing_databases.include? @dbname
         raise Fluent::ConfigError, 'Database ' + @dbname + ' doesn\'t exist. Create it first, please. Existing databases: ' + existing_databases.join(',')
       end
-    rescue InfluxDB::AuthenticationError
+    rescue InfluxDB::AuthenticationError, InfluxDB::Error
       $log.info "skip database presence check because '#{@user}' user doesn't have admin privilege. Check '#{@dbname}' exists on influxdb"
     end
   end
@@ -92,7 +93,7 @@ DESC
     if record.empty? || record.has_value?(nil)
       FORMATTED_RESULT_FOR_INVALID_RECORD
     else
-      [tag, time, record].to_msgpack
+      [tag, precision_time(time), record].to_msgpack
     end
   end
 
@@ -131,6 +132,12 @@ DESC
         tags[@sequence_tag] = @seq
         @prev_timestamp = timestamp
       end
+
+      if values.empty?
+          log.warn "Skip record '#{record}', because InfluxDB requires at least one value in raw"
+          next
+      end
+
       point = {
         :timestamp => timestamp,
         :series    => tag,
@@ -163,4 +170,30 @@ DESC
       end
     end
   end
+
+  def time_precise_lambda()
+    case @time_precision.to_sym
+    when :h then
+      lambda{|nstime| nstime / (10 ** 9) / (60 ** 2) }
+    when :m then
+      lambda{|nstime| nstime / (10 ** 9) / 60 }
+    when :s then
+      lambda{|nstime| nstime / (10 ** 9) }
+    when :ms then
+      lambda{|nstime| nstime / (10 ** 6) }
+    when :u then
+      lambda{|nstime| nstime / (10 ** 3) }
+    when :ns then
+      lambda{|nstime| nstime }
+    else
+      raise Fluent::ConfigError, 'time_precision ' + @time_precision + ' is invalid.' +
+        'should specify either either hour (h), minutes (m), second (s), millisecond (ms), microsecond (u), or nanosecond (ns)'
+    end
+  end
+
+  def precision_time(time)
+    # nsec is supported from v0.14
+    nstime = time * (10 ** 9) + (defined?(Fluent::EventTime) ? time.nsec : 0)
+    @time_precise.call(nstime)
+  end
 end

data/test/plugin/test_out_influxdb.rb

@@ -62,7 +62,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
 
   def test_format
     driver = create_driver(CONFIG, 'test')
-    time = Time.parse('2011-01-02 13:14:15 UTC').to_i
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
 
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
@@ -76,7 +76,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
   def test_write
     driver = create_driver(CONFIG, 'input.influxdb')
 
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
 
@@ -102,7 +102,6 @@ class InfluxdbOutputTest < Test::Unit::TestCase
         nil
       ]
     ], driver.instance.influxdb.points)
-
   end
 
   def test_empty_tag_keys
@@ -114,7 +113,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
 
     driver = create_driver(config_with_tags, 'input.influxdb')
 
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
     driver.emit({'a' => 1, 'b' => ''}, time)
     driver.emit({'a' => 2, 'b' => 1}, time)
     driver.emit({'a' => 3, 'b' => ' '}, time)
@@ -149,6 +148,37 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ], driver.instance.influxdb.points)
   end
 
+ def test_ignore_empty_values
+    config_with_tags = %Q(
+      #{CONFIG}
+
+      tag_keys ["b"]
+    )
+
+    driver = create_driver(config_with_tags, 'input.influxdb')
+
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    driver.emit({'b' => '3'}, time)
+    driver.emit({'a' => 2, 'b' => 1}, time)
+
+    data = driver.run
+
+    assert_equal([
+      [
+        [
+          {
+            :timestamp => time,
+            :series    => 'input.influxdb',
+            :values    => {'a' => 2},
+            :tags      => {'b' => 1},
+          }
+        ],
+        nil,
+        nil
+      ]
+    ], driver.instance.influxdb.points)
+  end
+
   def test_seq
     config = %[
       type influxdb
@@ -158,17 +188,18 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       user  testuser
       password  mypwd
       use_ssl false
-      time_precision s 
+      time_precision s
       sequence_tag _seq
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
 
-    driver.emit({'a' => 1}, time + 1)
-    driver.emit({'a' => 2}, time + 1)
+    time2 = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:16 UTC'))
+    driver.emit({'a' => 1}, time2)
+    driver.emit({'a' => 2}, time2)
 
     data = driver.run
 
@@ -188,13 +219,13 @@ class InfluxdbOutputTest < Test::Unit::TestCase
             :tags      => {'_seq' => 1},
           },
           {
-            :timestamp => time + 1,
+            :timestamp => time2,
             :series    => 'input.influxdb',
             :values    => {'a' => 1},
             :tags      => {'_seq' => 0},
           },
           {
-            :timestamp => time + 1,
+            :timestamp => time2,
             :series    => 'input.influxdb',
             :values    => {'a' => 2},
             :tags      => {'_seq' => 1},
@@ -213,7 +244,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
 
@@ -248,7 +279,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2, 'rp' => 'ephemeral_1d'}, time)
     driver.emit({'a' => 3, 'rp' => 'ephemeral_1m'}, time)
@@ -303,7 +334,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2, 'rp' => 'ephemeral_1d'}, time)
     driver.emit({'a' => 3, 'rp' => 'ephemeral_1m'}, time)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A buffered output plugin for fluentd and influxDB