fluent-plugin-influxdb-v2 1.7.0.pre.900 → 1.7.0.pre.935

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a31731bcb30638289e8f421d1a3575eb31ce8103a92ad3ac38f4218c8e492db
-  data.tar.gz: d399bc2def59e12395ccbd6f8edb8bf3f92511f36269a6e2187e834c01253bff
+  metadata.gz: b94a23a6f5078b6434a0dc7459754dfaac82dccb65dfa272163465a9043a0649
+  data.tar.gz: 827ef1d8f027500443032fe17c983a5bb5b1cbcc1bd76b2950c22d328847d6d0
 SHA512:
-  metadata.gz: 4882ea0e06ed3306c6c8f97dd9f7e63bfc452a92944b8586747ebbf0bc14677ed827a38dc6b36ddb3ec929a0216519ea7dcfb20f2473e13120503ecaefb8be41
-  data.tar.gz: b07efc474418df0eb6a02cc00ea23971e1e3cc194f3198bb387c09145a239b47a3a760b63d5ababd423a350f28678710bdd6fff69523f5a1e2648212d39115ef
+  metadata.gz: e384255ddb07b6db26454f643906cbe9c44ce50ab3ed5f903917d934e6a4924bc188337f0945c8ec26797a0cd1a9f4ae2f39ae5b2e5777963897d1c790207b7a
+  data.tar.gz: 48b0524cd35d4c7eea9785b41d74abc3b9ed16862d08f794fe5df374d68d303b718d54338eafc6cdf9fdfb298af58e3fb0bb95a1b89d1fe87932e4f7d00da747

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 ## 1.7.0 [unreleased]
 
+### 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. [#21](https://github.com/influxdata/influxdb-plugin-fluent/pull/21): Updated default docker image to v2.0.4
 
 ## 1.6.0 [2020-10-02]
 

data/README.md

@@ -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/fluent-plugin-influxdb-v2.gemspec

@@ -47,10 +47,11 @@ 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'
+  # Temporary depends to prerelease version - will be change to 1.12.0 after release the client
+  spec.add_runtime_dependency 'influxdb-client', '1.12.0.pre.1894'
 
   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/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.900
+  version: 1.7.0.pre.935
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-23 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.pre.1894
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.12.0.pre.1894
 - !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