fluent-plugin-influxdb-v2 1.9.0.pre.1328 → 1.10.0.pre.1476

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a162e715eaf1dee93dc05d613df4da916d5f81ef6321eefbf6e723961113e520
-  data.tar.gz: b79ade354978657ab2c2ef3c91e45101ce382a8b62a6a53fb39c0614a158df4b
+  metadata.gz: 6b1bc092f8b1c99bc986bd6d9dba0787b093a5ad7782860175c59a208639689a
+  data.tar.gz: 63a5c33f4e08cfbc1b8447e8429e42aca1a937a1c68f4567785535286e01d76b
 SHA512:
-  metadata.gz: 4013c2885ae49e89fdaa5c0f70a75dc60773a8a28e4496a575c1b659e6248d81facd6e7b445902775a003468c9ff4f29847f7103c6d2fae4fd1e7d8335c53af6
-  data.tar.gz: b730665dd393f67da8eba3ad5553093593ddec5325c3e7316d4af14afe640e04045b1d6b34983879fbe4e72bed6ee2d7a74dc9ed1610cc52746740f412ded8e2
+  metadata.gz: 5095425d9046a28ef0f558845e61be89550d4fa43541c8d7a657c59382a578a2aabd5965398f446023e5da9cfed3d2bf02ad1e1e1c16a95ccde3b7bac47ac9be
+  data.tar.gz: e2f4fe376f2b0259c90c927b808cb107eb7ef109e33c6ef4420d09e8eb7447da3880d91911b145b3483afeaca1617c8c124abe385ae75c6ce168672a5566afac

data/.circleci/config.yml

@@ -59,6 +59,17 @@ commands:
           command: |
             export MINITEST_REPORTER=JUnitReporter
             bundle exec rake test
+      - run:
+          name: Collecting coverage reports
+          command: |
+            curl -Os https://uploader.codecov.io/latest/linux/codecov
+            curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+            curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+            curl -s https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import
+            gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
+            shasum -a 256 -c codecov.SHA256SUM
+            chmod +x ./codecov
+            ./codecov
       - save_cache:
           name: Saving Gem Cache
           key: *cache-key

data/CHANGELOG.md

@@ -1,7 +1,13 @@
-## 1.9.0 [unreleased]
+## 1.10.0 [unreleased]
+
+### CI
+1. [#32](https://github.com/influxdata/influxdb-plugin-fluent/pull/32): Use new Codecov uploader for reporting code coverage
+
+## 1.9.0 [2021-11-26]
 
 ### Features
 1. [#30](https://github.com/influxdata/influxdb-plugin-fluent/pull/30): Field value for `time_key` can be formatted date (`2021-11-05 09:15:49.487727165 +0000`, `2021-11-05T10:04:43.617216Z`)
+1. [#31](https://github.com/influxdata/influxdb-plugin-fluent/pull/31): Add possibility to use LineProtocol from Fluetd's record.
 
 ### Dependencies
 1. [#30](https://github.com/influxdata/influxdb-plugin-fluent/pull/30): Update dependencies:

data/README.md

@@ -19,7 +19,7 @@ This repository contains the reference Fluentd plugin for the InfluxDB 2.0.
 The plugin is bundled as a gem and is hosted on [Rubygems](https://rubygems.org/gems/fluent-plugin-influxdb-v2).  You can install the gem as follows:
 
 ```
-fluent-gem install fluent-plugin-influxdb-v2 -v 1.8.0
+fluent-gem install fluent-plugin-influxdb-v2 -v 1.9.0
 ```
 
 ## Plugins
@@ -45,6 +45,7 @@ Store Fluentd event to InfluxDB 2 database.
 | field_cast_to_float | Turn on/off auto casting Integer value to Float. Helper to avoid mismatch error: 'series type mismatch: already Integer but got Float'. | bool | false |
 | time_precision | The time precision of timestamp. You should specify either second (s), millisecond (ms), microsecond (us), or nanosecond (ns). | String | ns |
 | time_key | A name of the record key that used as a 'timestamp' instead of event timestamp. If a record key doesn't exists or hasn't value then is used event timestamp. | String | nil |
+| line_protocol_key | A name of the record key that contains [LineProtocol](https://docs.influxdata.com/influxdb/v2.0/reference/syntax/line-protocol/). The value of this key is used for ingesting data into InfluxDB. If a record key doesn't exists or hasn't value then is used event timestamp. | String | nil |
 
 ##### Minimal configuration
 

data/fluent-plugin-influxdb-v2.gemspec

@@ -50,12 +50,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'influxdb-client', '2.1.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'codecov', '~> 0.1.16'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-reporters', '~> 1.4'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rubocop', '~> 0.66.0'
-  spec.add_development_dependency 'simplecov', '~> 0.17.1'
+  spec.add_development_dependency 'simplecov-cobertura', '~> 1.4.2'
   spec.add_development_dependency 'test-unit', '~> 3.3'
   spec.add_development_dependency 'webmock', '~> 3.7'
 end

data/lib/fluent/plugin/out_influxdb2.rb

@@ -73,6 +73,11 @@ class InfluxDBOutput < Fluent::Plugin::Output
   desc 'A name of the record key that used as a \'timestamp\' instead of event timestamp.' \
       'If a record key doesn\'t exists or hasn\'t value then is used event timestamp.'
 
+  config_param :line_protocol_key, :string, default: nil
+  desc 'A name of the record key that contains \'LineProtocol\'.' \
+      'The value of this key is used for ingesting data into InfluxDB.' \
+      'For more info see - https://docs.influxdata.com/influxdb/v2.0/reference/syntax/line-protocol/.'
+
   config_section :buffer do
     config_set_default :@type, DEFAULT_BUFFER_TYPE
     config_set_default :chunk_keys, ['tag']
@@ -121,22 +126,30 @@ class InfluxDBOutput < Fluent::Plugin::Output
     tag = chunk.metadata.tag
     bucket, measurement = expand_placeholders(chunk)
     chunk.msgpack_each do |time, record|
-      time_formatted = _format_time(time)
-      point = InfluxDB2::Point
-              .new(name: measurement)
-      record.each_pair do |k, v|
-        if k.eql?(@time_key)
-          time_formatted = _format_time(v)
-        else
-          _parse_field(k, v, point)
+      if @line_protocol_key
+        points << record[@line_protocol_key] if record.include?(@line_protocol_key)
+      else
+        time_formatted = _format_time(time)
+        point = InfluxDB2::Point
+                .new(name: measurement)
+        record.each_pair do |k, v|
+          if k.eql?(@time_key)
+            time_formatted = _format_time(v)
+          else
+            _parse_field(k, v, point)
+          end
+          point.add_tag('fluentd', tag) if @tag_fluentd
         end
-        point.add_tag('fluentd', tag) if @tag_fluentd
+        point.time(time_formatted, @precision)
+        points << point
       end
-      point.time(time_formatted, @precision)
-      points << point
     end
-    @write_api.write(data: points, bucket: bucket)
-    log.debug "Written points: #{points}"
+    if points.empty?
+      log.debug "Nothing to write for chunk: #{chunk.metadata}"
+    else
+      @write_api.write(data: points, bucket: bucket)
+      log.debug "Written points: #{points}"
+    end
   end
 
   private

data/lib/fluent/plugin/version.rb

@@ -21,7 +21,7 @@
 module InfluxDB2
   module Plugin
     module Fluent
-      VERSION = '1.9.0'.freeze
+      VERSION = '1.10.0'.freeze
     end
   end
 end

data/test/influxdb/plugin/output_test.rb

@@ -586,4 +586,39 @@ class InfluxDBOutputTest < Minitest::Test
     assert_requested(:post, 'https://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 1, body: 'placeholder_h2o_tag level=2i,location="europe" 1444897215000000000')
   end
+
+  def test_line_protocol
+    stub_request(:any, 'https://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+    driver = create_driver(%(
+      @type influxdb2
+      token my-token
+      bucket my-bucket
+      org my-org
+      time_precision ns
+      line_protocol_key lp_key
+    ))
+    driver.run(default_tag: 'h2o_tag') do
+      emit_documents(driver, 'location' => 'europe', 'level' => 2, 'lp_key' => 'mem,tag=1 field=10 102030')
+    end
+    assert_requested(:post, 'https://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'mem,tag=1 field=10 102030')
+  end
+
+  def test_line_protocol_not_defined
+    stub_request(:any, 'https://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+    driver = create_driver(%(
+      @type influxdb2
+      token my-token
+      bucket my-bucket
+      org my-org
+      time_precision ns
+      line_protocol_key lp_key
+    ))
+    driver.run(default_tag: 'h2o_tag') do
+      emit_documents(driver)
+    end
+    assert_requested(:post, 'https://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns', times: 0)
+  end
 end

data/test/test_helper.rb

@@ -22,8 +22,8 @@ require 'simplecov'
 SimpleCov.start
 
 if ENV['CI'] == 'true'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  require 'simplecov-cobertura'
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 end
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb-v2
 version: !ruby/object:Gem::Version
-  version: 1.9.0.pre.1328
+  version: 1.10.0.pre.1476
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.66.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: InfluxDB 2 output plugin for Fluentd