fluent-plugin-influxdb 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240d34c6c278cfaa2096132c91121e5ae81bb1e5
-  data.tar.gz: 8341dbe9edc1cce6857bdc3a7cc2477a7bd82350
+  metadata.gz: 4773755a8ead0cdfa5ecb44d7dcc2a56f1405388
+  data.tar.gz: 8ae5a2544035c5f852ccc4c1173bf25701cd9021
 SHA512:
-  metadata.gz: 9686476599931750a20a4e5cc58be50eaedfd4a0ec080f737455144c940e9a9a39a7e4795f2cc4a6c72d8029a783c9d1ff10a1dc98b60001ba6b4df17f55edf5
-  data.tar.gz: afb7eac371444b324ca75f2bb217cb7cf67ed32ec82a9d5eaf85dfd54cce56ca38978f99e6aaed02ca6234e570c2eae532e98df4d38ef00e3ec30f4d3cd46193
+  metadata.gz: 30c63e6ee4dae8a73e6087777fb25c21da02cd5745039d9c9a5b8667a3aeea86d7769c6e0784581b7186a5d85dabb282a58f7a2afbd8ef06dc55d4b0e7c2e9ac
+  data.tar.gz: 795949221c8242345bcb26e826d080e75c911774fda4eedeb8716aaf98dfb1abf88f3ea239f680f2e24b957d5d8ab1ffced4ae00c05bbced556492e93b948906

data/History.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.2.0 (July, 27, 2015)
+=====
+
+- Use influxdb gem 0.2.0 for influxdb 0.9 support
+
 0.1.8 (July, 12, 2015)
 =====
 

data/README.md

@@ -4,6 +4,11 @@ fluent-plugin-influxdb is a buffered output plugin for fluentd and influxDB.
 
 If you are using fluentd as a collector and want to organize your time-series data in influxDB, this is your right choice!
 
+## NOTE
+
+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.
+
 ## Installation
 
     $ fluent-gem install fluent-plugin-influxdb

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

data/lib/fluent/plugin/out_influxdb.rb

@@ -45,17 +45,17 @@ class Fluent::InfluxdbOutput < Fluent::BufferedOutput
   end
 
   def write(chunk)
-    points = {}
+    points = []
     chunk.msgpack_each do |tag, time, record|
       unless record.empty?
-        record[:time] = time unless record.has_key?('time')
-        points[tag] ||= []
-        points[tag] << record
+        point = {}
+        point[:timestamp] = record.delete('time') || time
+        point[:series] = tag
+        point[:values] = record
+        points << point
       end
     end
 
-    points.each { |tag, records|
-      @influxdb.write_point(tag, records)
-    }
+    @influxdb.write_points(points)
   end
 end

data/test/helper.rb

@@ -1 +1,30 @@
-require 'minitest/pride'
+require 'rubygems'
+require 'bundler'
+require 'pry'
+
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'fluent/test'
+unless ENV.has_key?('VERBOSE')
+  nulllogger = Object.new
+  nulllogger.instance_eval {|obj|
+    def method_missing(method, *args)
+      # pass
+    end
+  }
+  $log = nulllogger
+end
+
+require 'fluent/plugin/out_influxdb'
+
+class Test::Unit::TestCase
+end

data/test/plugin/test_out_influxdb.rb

@@ -0,0 +1,66 @@
+require 'helper'
+class InfluxdbOutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONFIG = %[
+    type influxdb
+    host  localhost
+    port  8086
+    dbname test
+    user  testuser
+    password  mypwd
+    use_ssl false
+    time_precision s
+  ]
+
+  def create_raw_driver(conf=CONFIG, tag='test')
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::InfluxdbOutput, tag).configure(conf)
+  end
+
+  def create_driver(conf=CONFIG, tag='test')
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::InfluxdbOutput, tag) do
+      def write(chunk)
+        chunk.read
+      end
+    end.configure(conf)
+  end
+
+  def test_configure
+    driver = create_raw_driver %[
+      dbname test
+      user  testuser
+      password  mypwd
+    ]
+    assert_equal('test', driver.instance.config['dbname'])
+    assert_equal('testuser', driver.instance.config['user'])
+    assert_equal('xxxxxx', driver.instance.config['password'])
+  end
+
+  def test_format
+    driver = create_driver(CONFIG, 'test')
+    time = Time.parse('2011-01-02 13:14:15 UTC').to_i
+
+    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
+  end
+
+  def test_write
+    driver = create_driver(CONFIG, 'input.influxdb')
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    driver.emit({'a' => 1}, time)
+    driver.emit({'a' => 2}, time)
+
+    data = driver.run
+
+    assert_equal(['input.influxdb', time, {'a' => 1}].to_msgpack +
+                 ['input.influxdb', time, {'a' => 2}].to_msgpack, data)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -35,16 +35,16 @@ dependencies:
   name: influxdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: InfluxDB output plugin for Fluentd
 email:
 - repeatedly@gmail.com
@@ -76,6 +104,7 @@ files:
 - fluent-plugin-influxdb.gemspec
 - lib/fluent/plugin/out_influxdb.rb
 - test/helper.rb
+- test/plugin/test_out_influxdb.rb
 homepage: https://github.com/fangli/fluent-plugin-influxdb
 licenses:
 - MIT
@@ -102,3 +131,4 @@ specification_version: 4
 summary: A buffered output plugin for fluentd and influxDB
 test_files:
 - test/helper.rb
+- test/plugin/test_out_influxdb.rb