fluent-plugin-influxdb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14be1643f9cb54355607b9c89c7431822437a737
-  data.tar.gz: 2aabaac2e4731df0666ed1bb3ed952c11ce159fa
+  metadata.gz: e7e725de952732ecd13619697db660c726654590
+  data.tar.gz: cac3f23f7b11d13417c8e4e42d66502c72a9ff0c
 SHA512:
-  metadata.gz: b6189486b6c5d849da9adcf542754346627efdf28daf0766b3366cd95d75c5334ace76e3c804ca36d58e3b681e9f53d0fbc80c1e93971d0b0640b15d0cddaa7e
-  data.tar.gz: 91e8817d92be059a2484b4adb6bcb12569cd15a3631c8df7a36280b10593224b2d105c6daca402558d964d10366585853a7ed2748a532fb260da7895ad7cc471
+  metadata.gz: 23dd436de2e4d05da0845ae241ec544e23e20950f289b09acaf673833e22f94b2527c7057de4eafcdf82bf4af0fc7bdb4d3efac3ee992bd69dbe2c1c8504eac6
+  data.tar.gz: 8221b15b87748a38149e2393366f7f640b45aad12c68786bb6678ae20d2bf8a06f49479f6fa4005cbda5c515e88a8bbb3c4579c2a587c15958b6f35339778746

data/History.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+1.1.0 (Jan, 21, 2019)
+=====
+
+- Skip record which has empty string field
+- Add cast_number_to_float parameter
+
 1.0.0 (Nov, 30, 2017)
 =====
 

data/README.md

@@ -16,12 +16,10 @@ If you are using InfluxDB version 0.8 please specify version 0.1.8 of this plugi
 | >= 1.0.0 | >= v0.14.0 | >= 2.1 |
 |  < 1.0.0 | >= v0.12.0 | >= 1.9 |
 
-NOTE: fluent-plugin-influxdb v1.0.0 is now RC. We will release stable v1.0.0 soon.
-
 ## Installation
 
     $ fluent-gem install fluent-plugin-influxdb -v "~> 0.3"  --no-document # for fluentd v0.12 or later
-    $ fluent-gem install fluent-plugin-influxdb -v 1.0.0.rc1 --no-document # for fluentd v0.14 or later
+    $ fluent-gem install fluent-plugin-influxdb --no-document # for fluentd v0.14 or later
 
 ### Ruby 2.0 or earlier
 
@@ -35,7 +33,7 @@ If you don't have a problem, use ruby 2.1 or later in production.
 
 Just like other regular output plugins, Use type `influxdb` in your fluentd configuration under `match` scope:
 
-`type` `influxdb`
+`@type` `influxdb`
 
 --------------
 
@@ -73,6 +71,8 @@ Just like other regular output plugins, Use type `influxdb` in your fluentd conf
 
 `retention_policy_key`: The name of the key in the record whose value specifies the retention policy.  The default retention policy will be applied if no such key exists.  influxdb >= 0.2.3 is required to use this functionality.
 
+`cast_number_to_float`: Enable/Disable casting number to float. influxdb can't mix integer/float value in one measurement. If your pipeline can't unify record value, this parameter may help. Avoid 'field type conflict' error.
+
 ### Fluentd Tag and InfluxDB Series
 
 influxdb plugin uses Fluentd event tag for InfluxDB series.
@@ -103,32 +103,21 @@ If you set `measurement` parameter, use its value instead of event tag.
 fluentd-plugin-influxdb is a buffered output plugin. So additional buffer configuration would be (with default values):
 
 ```
-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
+<buffer>
+  @type memory
+  chunk_limit_size 524288 # 512 * 1024
+  chunk_limit_records 1024
+  flush_interval 60
+  retry_limit 17
+  retry_wait 1.0
+  num_threads 1
+</buffer>
 ```
 
 The details of BufferedOutput is [here](http://docs.fluentd.org/articles/buffer-plugin-overview).
 
 ---
 
-fluentd-plugin-influxdb also includes the HandleTagNameMixin mixin which allows the following additional options:
-
-```
-remove_tag_prefix <tag_prefix_to_remove_including_the_dot>
-remove_tag_suffix <tag_suffix_to_remove_including_the_dot>
-add_tag_prefix <tag_prefix_to_add_including_the_dot>
-add_tag_suffix <tag_suffix_to_add_including_the_dot>
-```
-
----
-
-Also please consider using [fluent-plugin-multiprocess](https://github.com/frsyuki/fluent-plugin-multiprocess) to fork multiple threads for your metrics:
-
 ## Contributing
 
 

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       = '1.0.0'
+  s.version       = '1.1.0'
   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

@@ -53,7 +53,9 @@ DESC
                desc: "The key of the key in the record that stores the retention policy name"
   config_param :default_retention_policy, :string, default: nil,
                desc: "The name of the default retention policy"
-
+  config_param :cast_number_to_float, :bool, default: false,
+               desc: "Enable/Disable casting number to float"
+  
   config_section :buffer do
     config_set_default :@type, DEFAULT_BUFFER_TYPE
     config_set_default :chunk_keys, ['tag']
@@ -98,11 +100,13 @@ DESC
     end
   end
 
+  EMPTY_STRING = ''.freeze
   FORMATTED_RESULT_FOR_INVALID_RECORD = ''.freeze
 
   def format(tag, time, record)
-    # TODO: Use tag based chunk separation for more reliability
-    if record.empty? || record.has_value?(nil)
+    # nil and '' check should be in influxdb-ruby client...
+    if record.empty? || record.has_value?(nil) || record.has_value?(EMPTY_STRING)
+      log.warn "Skip record '#{record}' in '#{tag}', because either record has no value or at least a value is 'nil' inside the record."
       FORMATTED_RESULT_FOR_INVALID_RECORD
     else
       [precision_time(time), record].to_msgpack
@@ -158,6 +162,14 @@ DESC
           log.warn "Skip record '#{record}', because InfluxDB requires at least one value in raw"
           next
       end
+      
+      if @cast_number_to_float
+        values.each do |key, value|
+          if value.is_a?(Integer)
+            values[key] = Float(value)
+          end
+        end
+      end
 
       point = {
         timestamp: timestamp,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A buffered output plugin for fluentd and influxDB