fluent-plugin-influxdb_metrics 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-influxdb_metrics (0.0.2)
+    fluent-plugin-influxdb_metrics (0.0.3)
       fluentd
+      influxdb
 
 GEM
   remote: https://rubygems.org/
@@ -19,6 +20,8 @@ GEM
       sigdump (~> 0.2.2)
       yajl-ruby (~> 1.0)
     http_parser.rb (0.6.0)
+    influxdb (0.1.7)
+      json
     json (1.8.1)
     msgpack (0.5.8)
     rake (10.3.2)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/fluent-plugin-influxdb_metrics.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "fluentd"
+  s.add_runtime_dependency "influxdb"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "webmock"

data/lib/fluent/plugin/out_influxdb_metrics.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'date'
-require 'net/http'
+require 'influxdb'
 
 class Fluent::InfluxdbMetricsOutput < Fluent::BufferedOutput
   Fluent::Plugin.register_output('influxdb_metrics', self)
@@ -38,6 +38,14 @@ class Fluent::InfluxdbMetricsOutput < Fluent::BufferedOutput
     super
   end
 
+  def influx_client
+    @influxdb ||= InfluxDB::Client.new(@dbname, host: @host,
+                                                 port: @port,
+                                                 username: @user,
+                                                 password: @password)
+    @influxdb
+  end
+
   def write(chunk)
     bulk = []
 
@@ -46,16 +54,11 @@ class Fluent::InfluxdbMetricsOutput < Fluent::BufferedOutput
       bulk << formatted_record if formatted_record
     end
 
-    http = Net::HTTP.new(@host, @port)
-    resp, _ = http.post("/db/#{@dbname}/series?u=#{@user}&p=#{@password}&time_precision=s",
-                           Yajl::Encoder.encode(bulk) + "\n",
-                           'Content-Type' => 'text/json')
-    resp.value
+    influx_client.write_point(@table, bulk, false, 's')
   end
 
   def format_record(tag, time, record)
-    cols = ['time']
-    points = [time]
+    metric = {time: time}
 
     filter_keys.each do |field|
       path = field.split('.')
@@ -65,19 +68,11 @@ class Fluent::InfluxdbMetricsOutput < Fluent::BufferedOutput
       end
 
       if rec_pos
-        cols << field
-        points << rec_pos
+        metric[field] = rec_pos
       end
     end
 
-    if cols.length > 1
-      return {
-        name: @table,
-        columns: cols,
-        points: [points]
-      }
-    end
-
+    return metric if metric.keys.length > 1
     nil
   end
 end

data/test/plugin/test_out_influxdb_metrics.rb

@@ -37,7 +37,7 @@ class InfluxdbMetricsOutput < Test::Unit::TestCase
 
   def test_writes_to_default_index
     stub_influx
-    driver.configure('fields age,sub.field.pos')
+    driver.configure('fields age,sub.field.pos,_key')
     driver.emit(sample_record)
     driver.run
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: influxdb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -682791642725608838
+      hash: 3109599464123392193
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -682791642725608838
+      hash: 3109599464123392193
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23