fluent-plugin-influxdb-v2 1.7.0.pre.831 → 1.8.0.pre.972

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfac6beafe172f9a86b7d6269ab4d68c048a8969c2245d14c8edd032bd2d1a11
-  data.tar.gz: 7943cf450cc6c80bd090a807980f7a8498fc1aa2efc3bb8af3e0c213a85aa03a
+  metadata.gz: 1b7ff29c6e9ca3c151924c52453da41318b5e05e3df4bcbb688cd3ec893b8cd7
+  data.tar.gz: 4e69058c9f02fa37b420952e1ccfb246ef86e99cc944d05cce073965b88da5ef
 SHA512:
-  metadata.gz: 47c8c1bb81a78595aaac5980a4309ea31979f6aee9d8ad8af1c3b0919a1f3b472f8db9f69713c29e620361fc28f4b45165fc17e6bd73d8b7e61b34679a2718ba
-  data.tar.gz: b2a6e37795379fc3e2a14753a53cad1f82a6b89b5724d1d74c5fa1b87747a4456f66f10a5b5a0d168408240e328938c5c0e81bb19ef4e87941d592c2aed4355a
+  metadata.gz: db437e5e2002a0c69fbcfba3815e203c481c88daa63cb2a3c83364e67c9ceb38be5e8c3380c8e5eda8de2ba79607e036f5d7e965092c014d87e5e790ef6e5577
+  data.tar.gz: 9642e68088156e73edfb13b9ddd948a1466159c4ff0a5a8f03223b69aee0a7cb526c0b3f87d5755bdbb430c7642f3f787a232feb85efa31ca7be5e345efe5a71

data/.circleci/config.yml

@@ -78,10 +78,10 @@ jobs:
         default: &default-ruby-image "circleci/ruby:2.6-stretch"
       influxdb-image:
         type: string
-        default: &default-influxdb-image "influxdb:v2.0.3"
+        default: &default-influxdb-image "influxdb:latest"
     docker:
       - image: << parameters.ruby-image >>
-      - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>
+      - image: &influx-image << parameters.influxdb-image >>
         environment:
           INFLUXD_HTTP_BIND_ADDRESS: :8086
     steps:
@@ -124,7 +124,7 @@ workflows:
           name: ruby-2.6
       - tests-ruby:
           name: ruby-2.6-nightly
-          influxdb-image: "influxdb2:nightly"
+          influxdb-image: "quay.io/influxdb/influxdb:nightly"
       - tests-ruby:
           name: ruby-2.5
           ruby-image: "circleci/ruby:2.5-stretch"

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-## 1.7.0 [unreleased]
+## 1.8.0 [unreleased]
+
+## 1.7.0 [2021-03-05]
+
+### Features
+1. [#23](https://github.com/influxdata/influxdb-plugin-fluent/pull/23): Added possibility to specify the certification verification behaviour
 
 ### CI
-1. [#19](https://github.com/influxdata/influxdb-plugin-fluent/pull/19): Updated default docker image to v2.0.3
+1. [#24](https://github.com/influxdata/influxdb-plugin-fluent/pull/24): Updated stable image to `influxdb:latest` and nightly to `quay.io/influxdb/influxdb:nightly`
 
 ## 1.6.0 [2020-10-02]
 

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.6.0
+fluent-gem install fluent-plugin-influxdb-v2 -v 1.7.0
 ```
 
 ## Plugins
@@ -35,6 +35,7 @@ Store Fluentd event to InfluxDB 2 database.
 | url | InfluxDB URL to connect to (ex. https://localhost:8086). | String | https://localhost:8086 |
 | token | Access Token used for authenticating/authorizing the InfluxDB request sent by client. | String | |
 | use_ssl | Turn on/off SSL for HTTP communication. | bool | true |
+| verify_mode | Sets the flags for the certification verification at beginning of SSL/TLS session. | `"#{OpenSSL::SSL::VERIFY_NONE}"` or `"#{OpenSSL::SSL::VERIFY_PEER}"` | none |
 | bucket | Specifies the destination bucket for writes. | String | |
 | org | Specifies the destination organization for writes. | String | |
 | measurement | The name of the measurement. If not specified, Fluentd's tag is used. | String | nil |
@@ -75,6 +76,9 @@ Store Fluentd event to InfluxDB 2 database.
     token                   my-token
     # Turn on/off SSL for HTTP communication.
     use_ssl                 true
+    # Sets the flags for the certification verification at beginning of SSL/TLS session.
+    # For more info see - https://docs.ruby-lang.org/en/3.0.0/Net/HTTP.html#verify_mode.
+    verify_mode             "#{OpenSSL::SSL::VERIFY_NONE}"
 
     # Specifies the destination bucket for writes.
     bucket                  my-bucket

data/bin/influxdb-restart.sh

@@ -27,7 +27,7 @@ DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
 DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
 
 DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
-DEFAULT_INFLUXDB_V2_VERSION="v2.0.3"
+DEFAULT_INFLUXDB_V2_VERSION="v2.0.4"
 INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
 INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
 INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}

data/examples/README.md

@@ -41,7 +41,7 @@ docker run \
        --name influxdb_v2 \
        --network influx_network \
        --publish 8086:8086 \
-       quay.io/influxdb/influxdb:v2.0.3
+       influxdb:latest
 ```
 
 Create default organization, user and bucket:

data/examples/run-example.sh

@@ -49,7 +49,7 @@ docker run \
        --name influxdb_v2 \
        --network influx_network \
        --publish 8086:8086 \
-       quay.io/influxdb/influxdb:v2.0.3
+       influxdb:latest
 
 #
 # Post onBoarding request to InfluxDB 2

data/fluent-plugin-influxdb-v2.gemspec

@@ -47,10 +47,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_runtime_dependency 'fluentd', '~> 1.8'
-  spec.add_runtime_dependency 'influxdb-client', '1.8.0'
+  spec.add_runtime_dependency 'influxdb-client', '1.12.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'codecov', '~> 0.2.8'
+  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'

data/lib/fluent/plugin/out_influxdb2.rb

@@ -38,6 +38,10 @@ class InfluxDBOutput < Fluent::Plugin::Output
   config_param :use_ssl, :bool, default: true
   desc 'Turn on/off SSL for HTTP communication.'
 
+  config_param :verify_mode, :integer, default: nil
+  desc 'Sets the flags for the certification verification at beginning of SSL/TLS session. ' \
+      'For more info see - https://docs.ruby-lang.org/en/3.0.0/Net/HTTP.html#verify_mode.'
+
   config_param :bucket, :string
   desc 'Specifies the destination bucket for writes.'
 
@@ -97,8 +101,9 @@ class InfluxDBOutput < Fluent::Plugin::Output
   def start
     super
     log.info  "Connecting to InfluxDB: url: #{@url}, bucket: #{@bucket}, org: #{@org}, precision = #{@precision}, " \
-              "use_ssl = #{@use_ssl}"
-    @client = InfluxDB2::Client.new(@url, @token, bucket: @bucket, org: @org, precision: @precision, use_ssl: @use_ssl)
+              "use_ssl = #{@use_ssl}, verify_mode = #{@verify_mode}"
+    @client = InfluxDB2::Client.new(@url, @token, bucket: @bucket, org: @org, precision: @precision, use_ssl: @use_ssl,
+                                                  verify_mode: @verify_mode)
     @write_api = @client.create_write_api
   end
 

data/lib/fluent/plugin/version.rb

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

data/test/influxdb/plugin/output_test.rb

@@ -117,6 +117,41 @@ class InfluxDBOutputTest < Minitest::Test
     assert_equal '\'use_ssl\' parameter is required but nil is specified', error.message
   end
 
+  def test_verify_mode_default
+    driver = create_driver(%(
+        @type influxdb2
+        bucket my-bucket
+        org my-org
+        token my-token
+    ))
+
+    assert_nil driver.instance.verify_mode
+  end
+
+  def test_verify_mode_none
+    driver = create_driver(%(
+        @type influxdb2
+        bucket my-bucket
+        org my-org
+        token my-token
+        verify_mode "#{OpenSSL::SSL::VERIFY_NONE}"
+    ))
+
+    assert_equal OpenSSL::SSL::VERIFY_NONE, driver.instance.verify_mode
+  end
+
+  def test_verify_mode_peer
+    driver = create_driver(%(
+        @type influxdb2
+        bucket my-bucket
+        org my-org
+        token my-token
+        verify_mode "#{OpenSSL::SSL::VERIFY_PEER}"
+    ))
+
+    assert_equal OpenSSL::SSL::VERIFY_PEER, driver.instance.verify_mode
+  end
+
   def test_bucket_parameter
     error = assert_raises Fluent::ConfigError do
       create_driver(%(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb-v2
 version: !ruby/object:Gem::Version
-  version: 1.7.0.pre.831
+  version: 1.8.0.pre.972
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.1.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement