fluent-plugin-influxdb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31241c0d29bbf9d7442afa7d5f6d95e0a14c754a
-  data.tar.gz: ab28d482facd88629c06e1193c80755f87708179
+  metadata.gz: 60609e2ceb90b9f7cccc5bf4a93ab7148cacf62d
+  data.tar.gz: ec43bfe20afecc28a8c753a8349aab16f5bad4f8
 SHA512:
-  metadata.gz: 2d856b411ddfe9006b1a0fdbc1d0974c6ae0cd6b8f1b73ac9db3a5946d2bb7c3e557247ccfbec7e9d05450bec9f371423eba85da6fb0e6dbce3ad71f4a829a5e
-  data.tar.gz: 602a42ec0f0edc4ae7e61fbcc90679913c90a159ad6312d90c7950898b95f480f5219651c870d76b1e9a1309f2445ee9ee8f822942a7461beaba823af2b33858
+  metadata.gz: ab34d3a1fff3cb26472fe3865a664bbd0bf59ee3bc9bacfec93612686f1f4296fccb50ced6a40331219a1713cdf7c0a664fa86746eca25a2381e3a81ffe580d2
+  data.tar.gz: 388197910982006e628e36ac18f03c8658653b448983836d4d6259681d16558b74d28f474e3ebaa2e9cea7f84204df0c11f4df1dd3f98c8742b7d7d8b4f3d04c

data/History.md

@@ -1,12 +1,18 @@
 Changelog
 =========
 
+0.1.3 (Apr 3, 2015)
+=====
+
+- Use influxdb gem to write data
+- Ignore empty record to avoid client exception
+
 0.1.2
 =====
 
- - Remove value recognize from configuration
+- Remove value recognize from configuration
 
 0.1.0
 =====
 
- - Initial gem release.
+- Initial gem release.

data/README.md

@@ -1,4 +1,4 @@
-# Fluent::Plugin::InfluxDB
+# Fluent::Plugin::InfluxDB, a plugin for [Fluentd](http://fluentd.org)
 
 fluent-plugin-influxdb is a buffered output plugin for fluentd and influxDB.
 
@@ -6,7 +6,7 @@ If you are using fluentd as a collector and want to organize your time-series da
 
 ## Installation
 
-    $ gem install fluent-plugin-influxdb
+    $ fluent-gem install fluent-plugin-influxdb
 
 ## Usage
 
@@ -54,12 +54,16 @@ fluentd-plugin-influxdb is a buffered output plugin. So additional buffer config
 
 ```
 buffer_type memory
+buffer_chunk_limit 524288 # 512 * 1024
+buffer_queue_limit 1024
 flush_interval 60
 retry_limit 17
 retry_wait 1.0
 num_threads 1
 ```
 
+The details of BufferedOutput is [here](http://docs.fluentd.org/articles/buffer-plugin-overview).
+
 ---
 
 Also please consider using [fluent-plugin-multiprocess](https://github.com/frsyuki/fluent-plugin-multiprocess) to fork multiple threads for your metrics:

data/fluent-plugin-influxdb.gemspec

@@ -3,9 +3,9 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = "fluent-plugin-influxdb"
-  s.version       = '0.1.2'
-  s.authors       = ["FangLi"]
-  s.email         = ["surivlee@gmail.com"]
+  s.version       = '0.1.3'
+  s.authors       = ["Masahiro Nakagawa", "FangLi"]
+  s.email         = ["repeatedly@gmail.com", "surivlee@gmail.com"]
   s.description   = %q{InfluxDB output plugin for Fluentd}
   s.summary       = %q{A buffered output plugin for fluentd and influxDB}
   s.homepage      = "https://github.com/fangli/fluent-plugin-influxdb"
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "fluentd"
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "webmock"
+  s.add_development_dependency "influxdb"
 end

data/lib/fluent/plugin/out_influxdb.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 require 'date'
-require 'net/http'
+require 'influxdb'
 
 class Fluent::InfluxdbOutput < Fluent::BufferedOutput
   Fluent::Plugin.register_output('influxdb', self)
@@ -19,6 +19,13 @@ class Fluent::InfluxdbOutput < Fluent::BufferedOutput
 
   def configure(conf)
     super
+    @influxdb = InfluxDB::Client.new @dbname, host: @host, 
+                                              port: @port, 
+                                              username: @user, 
+                                              password: @password,
+                                              async: false,
+                                              time_precision: @time_precision
+                                              
   end
 
   def start
@@ -34,19 +41,11 @@ class Fluent::InfluxdbOutput < Fluent::BufferedOutput
   end
 
   def write(chunk)
-    bulk = []
-
     chunk.msgpack_each do |tag, time, record|
-      bulk << {
-        'name' => tag,
-        'columns' => record.keys << 'time',
-        'points' => [record.values << time],
-      }
+      unless record.empty?
+        record[:time] = time
+        @influxdb.write_point(tag, record)
+      end
     end
-
-    http = Net::HTTP.new(@host, @port.to_i)
-    request = Net::HTTP::Post.new("/db/#{@dbname}/series?u=#{@user}&p=#{password}&time_precision=#{time_precision}", {'content-type' => 'application/json; charset=utf-8'})
-    request.body = Yajl::Encoder.encode(bulk)
-    http.request(request).value
   end
 end

metadata

@@ -1,65 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
+- Masahiro Nakagawa
 - FangLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: webmock
+  name: influxdb
   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
 - surivlee@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - History.md
 - LICENSE
@@ -78,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A buffered output plugin for fluentd and influxDB