fluent-plugin-influxdb 0.3.3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e78185d926822ec62f1e88893ed00a9e7961b9e4
-  data.tar.gz: 3477dc4c0ca9acaa7f2cc3ab0be35f73a6287c49
+  metadata.gz: dd442a71e13241ba8c98b176ecc4a54566acc145
+  data.tar.gz: 3a6d9849679dbfc8de623ca602f45d2bcf49f8f6
 SHA512:
-  metadata.gz: 9df4ccb329447f2089dc4bf82b636d25fa3d6381616103dc8fced0b7435605edb9f6bbf2bcd1d2540a62356e2cf0e206ac2e653e13bdf3e5f5925b0ef915fc76
-  data.tar.gz: 3c4e7e30854bd2c91e5136c1a550c664ad99efe6eefd359c5d2f7cc7abe5a3f70b4f17aff45a675acbd0220caf452e2f9cebfe30358884735b91726bb3ad7754
+  metadata.gz: cebcb1e5e0428f0c3a3ed718a8ec42e18d62e98afb993c05ebf9ff5599d127ffe4cfa02aa4eb3fe69055a19e3bcc6233e7d86e64c119723677e913b6847b06f3
+  data.tar.gz: 34a9a7e5b91320af2df3070d97c1b57cd06a956d6f938cd551d5ccc3f0ea39f53512bbe1a3e5cb8718da09354db79c1f6c6d8310bce61863b14056ca2efbfd42

data/History.md

@@ -1,11 +1,6 @@
 Changelog
 =========
 
-0.3.3 (Aug, 30, 2017)
-=====
-
-- Restrict influxdb gem version
-
 0.3.2 (Jan, 18, 2017)
 =====
 

data/README.md

@@ -9,9 +9,19 @@ If you are using fluentd as a collector and want to organize your time-series da
 This version uses influxdb-ruby version 0.2.0 which no longer supports InfluxDB version 0.8 (which is also deprecated).
 If you are using InfluxDB version 0.8 please specify version 0.1.8 of this plugin.
 
+## Requirements
+
+| fluent-plugin-influxdb | fluentd | ruby |
+|------------------------|---------|------|
+| >= 1.0.0 | >= v0.14.0 | >= 2.1 |
+|  < 1.0.0 | >= v0.12.0 | >= 1.9 |
+
+NOTE: fluent-plugin-influxdb v1.0.0 is now RC. We will release stable v1.0.0 soon.
+
 ## Installation
 
-    $ fluent-gem install fluent-plugin-influxdb
+    $ fluent-gem install fluent-plugin-influxdb -v "~> 0.3"  --no-document # for fluentd v0.12 or later
+    $ fluent-gem install fluent-plugin-influxdb -v 1.0.0.rc1 --no-document # for fluentd v0.14 or later
 
 ### Ruby 2.0 or earlier
 
@@ -37,6 +47,8 @@ Just like other regular output plugins, Use type `influxdb` in your fluentd conf
 
 `dbname`: The database name of influxDB, default to "fluentd". you should create the database and grant permissions first
 
+`measurement`: The measurement/serise for record insertion. The default is nil.
+
 `user`: The DB user of influxDB, should be created manually, default to "root"
 
 `password`: The password of the user, default to "root"
@@ -66,6 +78,8 @@ Just like other regular output plugins, Use type `influxdb` in your fluentd conf
 influxdb plugin uses Fluentd event tag for InfluxDB series.
 So if you have events with `app.event`, influxdb plugin inserts events into `app.event` series in InfluxDB.
 
+If you set `measurement` parameter, use its value instead of event tag.
+
 ## Configuration Example
 
 ```

data/Rakefile

@@ -7,5 +7,5 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test
 

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.3'
+  s.version       = '1.0.0.rc1'
   s.authors       = ["Masahiro Nakagawa", "FangLi"]
   s.email         = ["repeatedly@gmail.com", "surivlee@gmail.com"]
   s.description   = %q{InfluxDB output plugin for Fluentd}
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "fluentd", [">= 0.10.49", "< 2"]
-  s.add_runtime_dependency "influxdb", [">= 0.2.0", "< 0.4"]
+  s.add_runtime_dependency "influxdb", ">= 0.2.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "pry"

data/lib/fluent/plugin/out_influxdb.rb

@@ -1,57 +1,63 @@
 # encoding: UTF-8
 require 'date'
 require 'influxdb'
-require 'fluent/output'
+require 'fluent/plugin/output'
 require 'fluent/mixin'
 
-class Fluent::InfluxdbOutput < Fluent::BufferedOutput
+class Fluent::Plugin::InfluxdbOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('influxdb', self)
 
-  include Fluent::HandleTagNameMixin
+  helpers :compat_parameters
 
-  config_param :host, :string,  :default => 'localhost',
-               :desc => "The IP or domain of influxDB, separate with comma."
-  config_param :port, :integer,  :default => 8086,
-               :desc => "The HTTP port of influxDB."
-  config_param :dbname, :string,  :default => 'fluentd',
-               :desc => <<-DESC
+  DEFAULT_BUFFER_TYPE = "memory"
+
+  config_param :host, :string,  default: 'localhost',
+               desc: "The IP or domain of influxDB, separate with comma."
+  config_param :port, :integer,  default: 8086,
+               desc: "The HTTP port of influxDB."
+  config_param :dbname, :string,  default: 'fluentd',
+               desc: <<-DESC
 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,
-               :desc => "The password of the user."
-  config_param :retry, :integer, :default => nil,
-               :desc => 'The finite number of retry times. default is infinite'
-  config_param :time_key, :string, :default => 'time',
-               :desc => 'Use value of this tag if it exists in event instead of event timestamp'
-  config_param :time_precision, :string, :default => 's',
-               :desc => <<-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,
+               desc: "The password of the user."
+  config_param :retry, :integer, default: nil,
+               desc: 'The finite number of retry times. default is infinite'
+  config_param :time_key, :string, default: 'time',
+               desc: 'Use value of this tag if it exists in event instead of event timestamp'
+  config_param :time_precision, :string, default: 's',
+               desc: <<-DESC
 The time precision of timestamp.
 You should specify either hour (h), minutes (m), second (s),
 millisecond (ms), microsecond (u), or nanosecond (ns).
 DESC
-  config_param :use_ssl, :bool, :default => false,
-               :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,
-               :desc => <<-DESC
+  config_param :use_ssl, :bool, default: false,
+               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,
+               desc: <<-DESC
 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.
 DESC
-  config_param :retention_policy_key, :string, :default => nil,
-               :desc => "The key of the key in the record that stores the retention policy name"
-  config_param :default_retention_policy, :string, :default => nil,
-               :desc => "The name of the default retention policy"
-
+  config_param :retention_policy_key, :string, default: nil,
+               desc: "The key of the key in the record that stores the retention policy name"
+  config_param :default_retention_policy, :string, default: nil,
+               desc: "The name of the default retention policy"
+
+  config_section :buffer do
+    config_set_default :@type, DEFAULT_BUFFER_TYPE
+    config_set_default :chunk_keys, ['tag']
+  end
 
   def initialize
     super
@@ -60,8 +66,10 @@ DESC
   end
 
   def configure(conf)
+    compat_parameters_convert(conf, :buffer)
     super
     @time_precise = time_precise_lambda()
+    raise Fluent::ConfigError, "'tag' in chunk_keys is required." if not @chunk_key_tag
   end
 
   def start
@@ -97,7 +105,7 @@ DESC
     if record.empty? || record.has_value?(nil)
       FORMATTED_RESULT_FOR_INVALID_RECORD
     else
-      [tag, precision_time(time), record].to_msgpack
+      [precision_time(time), record].to_msgpack
     end
   end
 
@@ -106,9 +114,18 @@ DESC
     @influxdb.stop!
   end
 
+  def formatted_to_msgpack_binary
+    true
+  end
+
+  def multi_workers_ready?
+    true
+  end
+
   def write(chunk)
     points = []
-    chunk.msgpack_each do |tag, time, record|
+    tag = chunk.metadata.tag
+    chunk.msgpack_each do |time, record|
       timestamp = record.delete(@time_key) || time
       if tag_keys.empty? && !@auto_tags
         values = record
@@ -143,10 +160,10 @@ DESC
       end
 
       point = {
-        :timestamp => timestamp,
-        :series    => @measurement || tag,
-        :values    => values,
-        :tags      => tags,
+        timestamp: timestamp,
+        series: @measurement || tag,
+        values: values,
+        tags: tags,
       }
       retention_policy = @default_retention_policy
       unless @retention_policy_key.nil?

data/test/helper.rb

@@ -14,6 +14,7 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
+require 'fluent/test/driver/output'
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|

data/test/plugin/test_out_influxdb.rb

@@ -20,6 +20,26 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     end
   end
 
+  class DummyInfluxdbOutput < Fluent::Plugin::InfluxdbOutput
+    attr_reader :influxdb
+    def configure(conf)
+      @influxdb = DummyInfluxDBClient.new()
+      super
+    end
+
+    def format(tag, time, record)
+      super
+    end
+
+    def formatted_to_msgpack_binary
+      true
+    end
+
+    def write(chunk)
+      super
+    end
+  end
+
   def setup
     Fluent::Test.setup
   end
@@ -35,18 +55,12 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     time_precision s
   ]
 
-  def create_raw_driver(conf=CONFIG, tag='test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::InfluxdbOutput, tag).configure(conf)
+  def create_raw_driver(conf=CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::InfluxdbOutput).configure(conf)
   end
 
-  def create_driver(conf=CONFIG, tag='test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::InfluxdbOutput, tag) do
-      attr_reader :influxdb
-      def configure(conf)
-        @influxdb = DummyInfluxDBClient.new()
-        super
-      end
-    end.configure(conf)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Output.new(DummyInfluxdbOutput).configure(conf)
   end
 
   def test_configure
@@ -60,47 +74,63 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     assert_equal('xxxxxx', driver.instance.config['password'])
   end
 
+  def test_configure_without_tag_chunk_key
+    assert_raise(Fluent::ConfigError) do
+      create_raw_driver %[
+        dbname test
+        user  testuser
+        password  mypwd
+        <buffer arbitrary_key>
+          @type memory
+        </buffer>
+      ]
+    end
+  end
+
   def test_format
-    driver = create_driver(CONFIG, 'test')
+    driver = create_driver(CONFIG)
     time = event_time('2011-01-02 13:14:15 UTC')
 
-    driver.emit({'a' => 1}, time)
-    driver.emit({'a' => 2}, time)
-
-    driver.expect_format(['test', time, {'a' => 1}].to_msgpack)
-    driver.expect_format(['test', time, {'a' => 2}].to_msgpack)
+    driver.run(default_tag: 'test') do
+      driver.feed(time, {'a' => 1})
+      driver.feed(time, {'a' => 2})
+    end
 
-    driver.run
+    assert_equal [[time, {'a' => 1}].to_msgpack,
+                  [time, {'a' => 2}].to_msgpack], driver.formatted
   end
 
-  def test_write
-    driver = create_driver(CONFIG, 'input.influxdb')
+  sub_test_case "#write" do
+    test "buffer" do
+      driver = create_driver(CONFIG)
 
-    time = event_time('2011-01-02 13:14:15 UTC')
-    driver.emit({'a' => 1}, time)
-    driver.emit({'a' => 2}, time)
-    driver.run
+      time = event_time("2011-01-02 13:14:15 UTC")
+      driver.run(default_tag: 'input.influxdb') do
+        driver.feed(time, {'a' => 1})
+        driver.feed(time, {'a' => 2})
+      end
 
-    assert_equal([
-      [
+      assert_equal([
         [
-          {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 1}
-          },
-          {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 2}
-          },
-        ],
-        nil,
-        nil
-      ]
-    ], driver.instance.influxdb.points)
+          [
+            {
+              timestamp: time,
+              series: 'input.influxdb',
+              tags: {},
+              values: {'a' => 1}
+            },
+            {
+              timestamp: time,
+              series: 'input.influxdb',
+              tags: {},
+              values: {'a' => 2}
+            },
+          ],
+          nil,
+          nil
+        ]
+      ], driver.instance.influxdb.points)
+    end
   end
 
   def test_write_with_measurement
@@ -109,12 +139,13 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       measurement test
     )
 
-    driver = create_driver(config_with_measurement, 'input.influxdb')
+    driver = create_driver(config_with_measurement)
 
     time = event_time('2011-01-02 13:14:15 UTC')
-    driver.emit({'a' => 1}, time)
-    driver.emit({'a' => 2}, time)
-    driver.run
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'a' => 1})
+      driver.feed(time, {'a' => 2})
+    end
 
     assert_equal([
       [
@@ -144,35 +175,35 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       tag_keys ["b"]
     )
 
-    driver = create_driver(config_with_tags, 'input.influxdb')
-
-    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)
+    driver = create_driver(config_with_tags)
 
-    driver.run
+    time = event_time("2011-01-02 13:14:15 UTC")
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'a' => 1, 'b' => ''})
+      driver.feed(time, {'a' => 2, 'b' => 1})
+      driver.feed(time, {'a' => 3, 'b' => ' '})
+    end
 
     assert_equal([
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :values    => {'a' => 1},
-            :tags      => {},
+            timestamp: time,
+            series: 'input.influxdb',
+            values: {'a' => 1},
+            tags: {},
           },
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :values    => {'a' => 2},
-            :tags      => {'b' => 1},
+            timestamp: time,
+            series: 'input.influxdb',
+            values: {'a' => 2},
+            tags: {'b' => 1},
           },
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :values    => {'a' => 3},
-            :tags      => {},
+            timestamp: time,
+            series: 'input.influxdb',
+            values: {'a' => 3},
+            tags: {},
           },
         ],
         nil,
@@ -188,14 +219,15 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       auto_tags true
     )
 
-    driver = create_driver(config_with_tags, 'input.influxdb')
+    driver = create_driver(config_with_tags)
 
     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)
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'a' => 1, 'b' => '1'})
+      driver.feed(time, {'a' => 2, 'b' => 1})
+      driver.feed(time, {'a' => 3, 'b' => ' '})
+    end
 
-    driver.run
     assert_equal([
       [
         [
@@ -233,13 +265,14 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       tag_keys ["b"]
     )
 
-    driver = create_driver(config_with_tags, 'input.influxdb')
+    driver = create_driver(config_with_tags)
 
     time = event_time('2011-01-02 13:14:15 UTC')
-    driver.emit({'b' => '3'}, time)
-    driver.emit({'a' => 2, 'b' => 1}, time)
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'b' => '3'})
+      driver.feed(time, {'a' => 2, 'b' => 1})
+    end
 
-    driver.run
     assert_equal([
       [
         [
@@ -255,7 +288,7 @@ class InfluxdbOutputTest < Test::Unit::TestCase
         nil
       ]
     ], driver.instance.influxdb.points)
-  end  
+  end
 
   def test_seq
     config = %[
@@ -269,43 +302,44 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       time_precision s
       sequence_tag _seq
     ]
-    driver = create_driver(config, 'input.influxdb')
+    driver = create_driver(config)
 
-    time = event_time('2011-01-02 13:14:15 UTC')
-    driver.emit({'a' => 1}, time)
-    driver.emit({'a' => 2}, time)
+    time = event_time("2011-01-02 13:14:15 UTC")
+    next_time = Fluent::EventTime.new(time + 1)
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'a' => 1})
+      driver.feed(time, {'a' => 2})
 
-    time2 = event_time('2011-01-02 13:14:16 UTC')
-    driver.emit({'a' => 1}, time2)
-    driver.emit({'a' => 2}, time2)
+      driver.feed(next_time, {'a' => 1})
+      driver.feed(next_time, {'a' => 2})
+    end
 
-    driver.run
     assert_equal([
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :values    => {'a' => 1},
-            :tags      => {'_seq' => 0},
+            timestamp: time,
+            series: 'input.influxdb',
+            values: {'a' => 1},
+            tags: {'_seq' => 0},
           },
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :values    => {'a' => 2},
-            :tags      => {'_seq' => 1},
+            timestamp: time,
+            series: 'input.influxdb',
+            values: {'a' => 2},
+            tags: {'_seq' => 1},
           },
           {
-            :timestamp => time2,
-            :series    => 'input.influxdb',
-            :values    => {'a' => 1},
-            :tags      => {'_seq' => 0},
+            timestamp: time + 1,
+            series: 'input.influxdb',
+            values: {'a' => 1},
+            tags: {'_seq' => 0},
           },
           {
-            :timestamp => time2,
-            :series    => 'input.influxdb',
-            :values    => {'a' => 2},
-            :tags      => {'_seq' => 1},
+            timestamp: time + 1,
+            series: 'input.influxdb',
+            values: {'a' => 2},
+            tags: {'_seq' => 1},
           }
         ],
         nil,
@@ -319,27 +353,28 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     config = CONFIG + "\n" + %[
       default_retention_policy ephemeral_1d
     ]
-    driver = create_driver(config, 'input.influxdb')
+    driver = create_driver(config)
 
-    time = event_time('2011-01-02 13:14:15 UTC')
-    driver.emit({'a' => 1}, time)
-    driver.emit({'a' => 2}, time)
+    time = event_time("2011-01-02 13:14:15 UTC")
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'a' => 1})
+      driver.feed(time, {'a' => 2})
+    end
 
-    driver.run
     assert_equal([
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 1}
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 1}
           },
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 2}
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 2}
           },
         ],
         nil,
@@ -353,22 +388,23 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     config = CONFIG + "\n" + %[
       retention_policy_key rp
     ]
-    driver = create_driver(config, 'input.influxdb')
+    driver = create_driver(config)
 
-    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)
+    time = event_time("2011-01-02 13:14:15 UTC")
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'a' => 1})
+      driver.feed(time, {'a' => 2, 'rp' => 'ephemeral_1d'})
+      driver.feed(time, {'a' => 3, 'rp' => 'ephemeral_1m'})
+    end
 
-    driver.run
     assert_equal([
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 1},
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 1},
           }
         ],
         nil,
@@ -377,10 +413,10 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 2},
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 2},
           }
         ],
         nil,
@@ -389,10 +425,10 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 3},
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 3},
           }
         ],
         nil,
@@ -407,29 +443,30 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       default_retention_policy ephemeral_1d
       retention_policy_key rp
     ]
-    driver = create_driver(config, 'input.influxdb')
+    driver = create_driver(config)
 
-    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)
-    driver.emit({'a' => 4}, time)
+    time = event_time("2011-01-02 13:14:15 UTC")
+    driver.run(default_tag: 'input.influxdb') do
+      driver.feed(time, {'a' => 1})
+      driver.feed(time, {'a' => 2, 'rp' => 'ephemeral_1d'})
+      driver.feed(time, {'a' => 3, 'rp' => 'ephemeral_1m'})
+      driver.feed(time, {'a' => 4})
+    end
 
-    driver.run
     assert_equal([
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 1},
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 1},
           },
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 2},
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 2},
           }
         ],
         nil,
@@ -438,10 +475,10 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 3},
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 3},
           }
         ],
         nil,
@@ -450,10 +487,10 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       [
         [
           {
-            :timestamp => time,
-            :series    => 'input.influxdb',
-            :tags      => {},
-            :values    => {'a' => 4},
+            timestamp: time,
+            series: 'input.influxdb',
+            tags: {},
+            values: {'a' => 4},
           }
         ],
         nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -38,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,12 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A buffered output plugin for fluentd and influxDB