fluent-plugin-influxdb 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 659fc90e62fb688b58a1846586ac472afeea1930
-  data.tar.gz: 90a268553b8597b8fa4a2501e06820870bdf4e4c
+  metadata.gz: 4afa2a9a824f0e8244f43a91388672bd3aeb5b37
+  data.tar.gz: 62b6862ca594e33baba91d1e636f99a25a46e03c
 SHA512:
-  metadata.gz: df2e35733cc5a28310a4e77458cee98328b9ab10cebd7efcf34b61883a49f6b6336daa68b2729008a3c6588b3f34356754cfe1f3b6bb563fc9d3f57200917293
-  data.tar.gz: 3977a6a8914bd8078d3c29d97daad7f7329d587600349008fd02ac81515df33611ad5d2bb9493cb4917a9062d612d7caf027a3736eb381310373169db4a04e1d
+  metadata.gz: 5130af21066c04c43b6513a90cd487ea5dd854631142e7aec926ad1a831d162f677ad10f45168bddad4fbb19d0fa87d327c6773540030a084ede0e89c2498c71
+  data.tar.gz: 023de58413a574403ef90656b440b7c21853aab89fef305d8348a6c420bfba4582f0e12a1b3d0665aab3e3f4456062790f188c2ce80cb228551d99540b8c0e4c

data/History.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.3.2 (Jan, 18, 2017)
+=====
+
+- Add measurement parameter
+
 0.3.1 (Jan, 07, 2017)
 =====
 

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.1'
+  s.version       = '0.3.2'
   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

@@ -18,6 +18,8 @@ class Fluent::InfluxdbOutput < Fluent::BufferedOutput
 The database name of influxDB.
 You should create the database and grant permissions at first.
 DESC
+  config_param :measurement, :string, :default => nil,
+               :desc => "The measurement name to insert events. If not specified, fluentd's tag is used"
   config_param :user, :string,  :default => 'root',
                :desc => "The DB user of influxDB, should be created manually."
   config_param :password, :string,  :default => 'root', :secret => true,
@@ -142,7 +144,7 @@ DESC
 
       point = {
         :timestamp => timestamp,
-        :series    => tag,
+        :series    => @measurement || tag,
         :values    => values,
         :tags      => tags,
       }

data/test/plugin/test_out_influxdb.rb

@@ -79,8 +79,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     time = event_time('2011-01-02 13:14:15 UTC')
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
-
-    data = driver.run
+    driver.run
 
     assert_equal([
       [
@@ -104,10 +103,44 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     ], driver.instance.influxdb.points)
   end
 
+  def test_write_with_measurement
+    config_with_measurement = %Q(
+      #{CONFIG}
+      measurement test
+    )
+
+    driver = create_driver(config_with_measurement, 'input.influxdb')
+
+    time = event_time('2011-01-02 13:14:15 UTC')
+    driver.emit({'a' => 1}, time)
+    driver.emit({'a' => 2}, time)
+    driver.run
+
+    assert_equal([
+      [
+        [
+          {
+            :timestamp => time,
+            :series    => 'test',
+            :tags      => {},
+            :values    => {'a' => 1}
+          },
+          {
+            :timestamp => time,
+            :series    => 'test',
+            :tags      => {},
+            :values    => {'a' => 2}
+          },
+        ],
+        nil,
+        nil
+      ]
+    ], driver.instance.influxdb.points)
+  end
+
   def test_empty_tag_keys
     config_with_tags = %Q(
       #{CONFIG}
-
       tag_keys ["b"]
     )
 
@@ -118,7 +151,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     driver.emit({'a' => 2, 'b' => 1}, time)
     driver.emit({'a' => 3, 'b' => ' '}, time)
 
-    data = driver.run
+    driver.run
 
     assert_equal([
       [
@@ -147,8 +180,8 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       ]
     ], driver.instance.influxdb.points)
   end
-  
- def test_auto_tagging
+
+  def test_auto_tagging
     config_with_tags = %Q(
       #{CONFIG}
 
@@ -162,9 +195,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     driver.emit({'a' => 2, 'b' => 1}, time)
     driver.emit({'a' => 3, 'b' => ' '}, time)
 
-
-    data = driver.run
-
+    driver.run
     assert_equal([
       [
         [
@@ -193,9 +224,9 @@ class InfluxdbOutputTest < Test::Unit::TestCase
         nil
       ]
     ], driver.instance.influxdb.points)
-  end  
+  end
 
- def test_ignore_empty_values
+  def test_ignore_empty_values
     config_with_tags = %Q(
       #{CONFIG}
 
@@ -208,8 +239,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     driver.emit({'b' => '3'}, time)
     driver.emit({'a' => 2, 'b' => 1}, time)
 
-    data = driver.run
-
+    driver.run
     assert_equal([
       [
         [
@@ -249,8 +279,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     driver.emit({'a' => 1}, time2)
     driver.emit({'a' => 2}, time2)
 
-    data = driver.run
-
+    driver.run
     assert_equal([
       [
         [
@@ -296,8 +325,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     driver.emit({'a' => 1}, time)
     driver.emit({'a' => 2}, time)
 
-    data = driver.run
-
+    driver.run
     assert_equal([
       [
         [
@@ -332,8 +360,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     driver.emit({'a' => 2, 'rp' => 'ephemeral_1d'}, time)
     driver.emit({'a' => 3, 'rp' => 'ephemeral_1m'}, time)
 
-    data = driver.run
-
+    driver.run
     assert_equal([
       [
         [
@@ -388,8 +415,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     driver.emit({'a' => 3, 'rp' => 'ephemeral_1m'}, time)
     driver.emit({'a' => 4}, time)
 
-    data = driver.run
-
+    driver.run
     assert_equal([
       [
         [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-01-18 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