fluent-plugin-influxdb 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb64d01147c57b8d3ea6bafc973d053689c62f7
-  data.tar.gz: ddd20e12317330808ec2a1e35371313bf7978fad
+  metadata.gz: 17b05b4d4062e69351985214664cd8802f693884
+  data.tar.gz: 7c48f1472a0f615416011887c55aefdc2d8a4b90
 SHA512:
-  metadata.gz: bee1f8f0765b3a688b6efcd5ef57456017ae9db1004e217dab04df65cc33c700579e0e8084dc6d37f8487e44f7bb95f5e3d767c44f13fea73c71c1a59cf1e0ef
-  data.tar.gz: 93158c02a95768823c7a25fc0eebe05a4cc201f3f6d93a99f4a3f528a32622a1552ee941368679bbf6e980ab5915aee21121a715b0ef517c9e15b3a16f1d2730
+  metadata.gz: 1c40c346d389f84f42504510270a31d18ec8395535ca2335172a7796367f31f4906bd12580fe36f4ae5aa5b59dd98ab33e7f1bdb0f787d4c5787794d493d46d8
+  data.tar.gz: 7bfa200fbf29e479259e39466929494fe36cf7e33e56cda96190c814d7996da676226eaa31685d64497603c0873f62b1d8f5033436114365399d630629e359d4

data/History.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.2.5 (Apr, 19, 2016)
+=====
+
+- Ignore blank tag value
+- Improve the configuration verificaiton
+
 0.2.4 (Apr, 11, 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.4'
+  s.version       = '0.2.5'
   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

@@ -47,18 +47,27 @@ DESC
 
   def configure(conf)
     super
-    @influxdb = InfluxDB::Client.new @dbname, host: @host,
-                                              port: @port,
-                                              username: @user,
-                                              password: @password,
-                                              async: false,
-                                              time_precision: @time_precision,
-                                              use_ssl: @use_ssl,
-                                              verify_ssl: @verify_ssl
   end
 
   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}"
+
+    # ||= for testing.
+    @influxdb ||= InfluxDB::Client.new @dbname, host: @host,
+                                                port: @port,
+                                                username: @user,
+                                                password: @password,
+                                                async: false,
+                                                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(',')
+    end
   end
 
   FORMATTED_RESULT_FOR_INVALID_RECORD = ''.freeze
@@ -88,7 +97,10 @@ DESC
         tags = {}
         record.each_pair do |k, v|
           if @tag_keys.include?(k)
-            tags[k] = v
+            # If the tag value is not nil, empty, or a space, add the tag
+            if v.to_s.strip != ''
+              tags[k] = v
+            end
           else
             values[k] = v
           end

data/test/plugin/test_out_influxdb.rb

@@ -8,6 +8,10 @@ class InfluxdbOutputTest < Test::Unit::TestCase
       @points = []
     end
 
+    def list_databases
+      [{'name' => 'test'}]
+    end
+
     def write_points(points)
       @points += points
     end
@@ -35,9 +39,9 @@ class InfluxdbOutputTest < Test::Unit::TestCase
   def create_driver(conf=CONFIG, tag='test')
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::InfluxdbOutput, tag) do
       attr_reader :influxdb
-      def configure(conf)
-        super
+      def start
         @influxdb = DummyInfluxDBClient.new()
+        super
       end
     end.configure(conf)
   end
@@ -92,6 +96,44 @@ class InfluxdbOutputTest < Test::Unit::TestCase
 
   end
 
+  def test_empty_tag_keys
+    config_with_tags = %Q(
+      #{CONFIG}
+
+      tag_keys ["b"]
+    )
+
+    driver = create_driver(config_with_tags, 'input.influxdb')
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    driver.emit({'a' => 1, 'b' => ''}, time)
+    driver.emit({'a' => 2, 'b' => 1}, time)
+    driver.emit({'a' => 3, 'b' => ' '}, time)
+
+    data = driver.run
+
+    assert_equal([
+      {
+        :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' => 3},
+        :tags      => {},
+      }
+    ], driver.instance.influxdb.points)
+  end
+
   def test_seq
     config = %[
       type influxdb

metadata

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