fluent-plugin-influxdb 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b05b4d4062e69351985214664cd8802f693884
-  data.tar.gz: 7c48f1472a0f615416011887c55aefdc2d8a4b90
+  metadata.gz: a070089e8dc07509c16215ef08d368ec1091662c
+  data.tar.gz: df19de18d8a2614e49f48a2ed12c9dd97063a8b3
 SHA512:
-  metadata.gz: 1c40c346d389f84f42504510270a31d18ec8395535ca2335172a7796367f31f4906bd12580fe36f4ae5aa5b59dd98ab33e7f1bdb0f787d4c5787794d493d46d8
-  data.tar.gz: 7bfa200fbf29e479259e39466929494fe36cf7e33e56cda96190c814d7996da676226eaa31685d64497603c0873f62b1d8f5033436114365399d630629e359d4
+  metadata.gz: 6b7eaeedded220c7941b2f9c2fa736ec84415c6f29b4ed3ef62e912af27dad0358068644ed4d596a36f9974ccb45ef609f9bbf59ce989079b374004c7e83e55e
+  data.tar.gz: 70ead7e7d18a23de64a6ab43a78a54aa81ee3172e50417d01b05fdc46f5f230bd24de4e277bfb5e7b481a41c52747ac9b69e9c543c1075bb9f5f89774e29d9b0

data/History.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.2.6 (Apr, 22, 2016)
+=====
+
+- Add time_key parameter
+- Add retry parameter
+- Skip database check when user doesn't have right permission
+
 0.2.5 (Apr, 19, 2016)
 =====
 

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.2.5'
+  s.version       = '0.2.6'
   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

@@ -20,6 +20,10 @@ DESC
                :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.
@@ -52,7 +56,7 @@ DESC
   def start
     super
 
-    $log.info "Connecting to database: #{@dbname}, host: #{@host}, port: #{@port}, username: #{@user}, password = #{@password}, use_ssl = #{@use_ssl}, verify_ssl = #{@verify_ssl}"
+    $log.info "Connecting to database: #{@dbname}, host: #{@host}, port: #{@port}, username: #{@user}, use_ssl = #{@use_ssl}, verify_ssl = #{@verify_ssl}"
 
     # ||= for testing.
     @influxdb ||= InfluxDB::Client.new @dbname, host: @host,
@@ -60,13 +64,18 @@ DESC
                                                 username: @user,
                                                 password: @password,
                                                 async: false,
+                                                retry: @retry,
                                                 time_precision: @time_precision,
                                                 use_ssl: @use_ssl,
                                                 verify_ssl: @verify_ssl
 
-    existing_databases = @influxdb.list_databases.map { |x| x['name'] }
-    unless existing_databases.include? @dbname
-      raise Fluent::ConfigError, 'Database ' + @dbname + ' doesn\'t exist. Create it first, please. Existing databases: ' + existing_databases.join(',')
+    begin
+      existing_databases = @influxdb.list_databases.map { |x| x['name'] }
+      unless existing_databases.include? @dbname
+        raise Fluent::ConfigError, 'Database ' + @dbname + ' doesn\'t exist. Create it first, please. Existing databases: ' + existing_databases.join(',')
+      end
+    rescue InfluxDB::AuthenticationError
+      $log.info "skip database presence check because '#{@user}' user doesn't have admin privilege. Check '#{@dbname}' exists on influxdb"
     end
   end
 
@@ -83,12 +92,13 @@ DESC
 
   def shutdown
     super
+    @influxdb.stop!
   end
 
   def write(chunk)
     points = []
     chunk.msgpack_each do |tag, time, record|
-      timestamp = record.delete('time') || time
+      timestamp = record.delete(@time_key) || time
       if tag_keys.empty?
         values = record
         tags = {}

data/test/plugin/test_out_influxdb.rb

@@ -15,6 +15,9 @@ class InfluxdbOutputTest < Test::Unit::TestCase
     def write_points(points)
       @points += points
     end
+
+    def stop!
+    end
   end
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd