fluent-plugin-influxdb 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e1211e313f744ceecfb57ec8a21f22715569b2
-  data.tar.gz: be8470752389e6369cc5860695d127691fc55939
+  metadata.gz: 659fc90e62fb688b58a1846586ac472afeea1930
+  data.tar.gz: 90a268553b8597b8fa4a2501e06820870bdf4e4c
 SHA512:
-  metadata.gz: 0241c72b998cf7df9e9ad341ef9385d74d511ede88598056c5edfa90f17f90d0c68dab2b77fc3f35ec6696a1bee99fa83a7dfb8239a773eba9b39bf2d7689760
-  data.tar.gz: 96511394b68b23bd8daad5e2bc3489bd7757bb1118739012b5d84b6256f7f86af65e419774d82d57e17bf1f3afb91803ce8bdda26fba41952aa46877811d3417
+  metadata.gz: df2e35733cc5a28310a4e77458cee98328b9ab10cebd7efcf34b61883a49f6b6336daa68b2729008a3c6588b3f34356754cfe1f3b6bb563fc9d3f57200917293
+  data.tar.gz: 3977a6a8914bd8078d3c29d97daad7f7329d587600349008fd02ac81515df33611ad5d2bb9493cb4917a9062d612d7caf027a3736eb381310373169db4a04e1d

data/History.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.3.1 (Jan, 07, 2017)
+=====
+
+- Add auto_tags parameter
+
 0.3.0 (Dec, 15, 2016)
 =====
 

data/README.md

@@ -51,6 +51,8 @@ Just like other regular output plugins, Use type `influxdb` in your fluentd conf
 
 `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)
 
+`auto_tags`: Enable/Disable auto-tagging behaviour which makes strings tags.
+
 `tag_keys`: The names of the keys to use as influxDB tags.
 
 `sequence_tag`: The name of the tag whose value is incremented for the consecutive simultaneous events and reset to zero for a new event with the different timestamp

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.3.0'
+  s.version       = '0.3.1'
   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

@@ -36,6 +36,8 @@ DESC
                :desc => "Use SSL when connecting to influxDB."
   config_param :verify_ssl, :bool, :default => true,
                :desc => "Enable/Disable SSL Certs verification when connecting to influxDB via SSL."
+  config_param :auto_tags, :bool, :default => false,
+               :desc => "Enable/Disable auto-tagging behaviour which makes strings tags."
   config_param :tag_keys, :array, :default => [],
                :desc => "The names of the keys to use as influxDB tags."
   config_param :sequence_tag, :string, :default => nil,
@@ -106,14 +108,14 @@ DESC
     points = []
     chunk.msgpack_each do |tag, time, record|
       timestamp = record.delete(@time_key) || time
-      if tag_keys.empty?
+      if tag_keys.empty? && !@auto_tags
         values = record
         tags = {}
       else
         values = {}
         tags = {}
         record.each_pair do |k, v|
-          if @tag_keys.include?(k)
+          if (@auto_tags && v.is_a?(String)) || @tag_keys.include?(k)
             # If the tag value is not nil, empty, or a space, add the tag
             if v.to_s.strip != ''
               tags[k] = v

data/test/helper.rb

@@ -24,7 +24,10 @@ unless ENV.has_key?('VERBOSE')
   $log = nulllogger
 end
 
+require 'fluent/test/helpers'
 require 'fluent/plugin/out_influxdb'
 
+include Fluent::Test::Helpers
+
 class Test::Unit::TestCase
 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 = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('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 = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('2011-01-02 13:14:15 UTC')
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
 
@@ -113,7 +113,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
 
     driver = create_driver(config_with_tags, 'input.influxdb')
 
-    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('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)
@@ -147,6 +147,53 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       ]
     ], driver.instance.influxdb.points)
   end
+  
+ def test_auto_tagging
+    config_with_tags = %Q(
+      #{CONFIG}
+
+      auto_tags true
+    )
+
+    driver = create_driver(config_with_tags, 'input.influxdb')
+
+    time = event_time("2011-01-02 13:14:15 UTC")
+    driver.emit({'a' => 1, 'b' => '1'}, time)
+    driver.emit({'a' => 2, 'b' => 1}, time)
+    driver.emit({'a' => 3, 'b' => ' '}, time)
+
+
+    data = driver.run
+
+    assert_equal([
+      [
+        [
+          {
+            :timestamp => time,
+            :series    => 'input.influxdb',
+
+            :values    => {'a' => 1},
+            :tags      => {'b' => '1'},
+          },
+          {
+            :timestamp => time,
+            :series    => 'input.influxdb',
+            :values    => {'a' => 2, 'b' => 1},
+            :tags      => {},
+          },
+          {
+            :timestamp => time,
+            :series    => 'input.influxdb',
+            :values    => {'a' => 3},
+            :tags      => {},
+          },
+
+        ],
+        nil,
+        nil
+      ]
+    ], driver.instance.influxdb.points)
+  end  
 
  def test_ignore_empty_values
     config_with_tags = %Q(
@@ -157,7 +204,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
 
     driver = create_driver(config_with_tags, 'input.influxdb')
 
-    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('2011-01-02 13:14:15 UTC')
     driver.emit({'b' => '3'}, time)
     driver.emit({'a' => 2, 'b' => 1}, time)
 
@@ -169,6 +216,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
           {
             :timestamp => time,
             :series    => 'input.influxdb',
+
             :values    => {'a' => 2},
             :tags      => {'b' => 1},
           }
@@ -177,7 +225,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
         nil
       ]
     ], driver.instance.influxdb.points)
-  end
+  end  
 
   def test_seq
     config = %[
@@ -193,11 +241,11 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('2011-01-02 13:14:15 UTC')
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
 
-    time2 = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:16 UTC'))
+    time2 = event_time('2011-01-02 13:14:16 UTC')
     driver.emit({'a' => 1}, time2)
     driver.emit({'a' => 2}, time2)
 
@@ -244,7 +292,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('2011-01-02 13:14:15 UTC')
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
 
@@ -279,7 +327,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('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)
@@ -334,7 +382,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ]
     driver = create_driver(config, 'input.influxdb')
 
-    time = Fluent::EventTime.from_time(Time.parse('2011-01-02 13:14:15 UTC'))
+    time = event_time('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.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-07 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.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A buffered output plugin for fluentd and influxDB