fluent-plugin-influxdb-v2 1.7.0.pre.729 → 1.7.0.pre.960

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4ede1dd6f73ef012d161def3c6bfa1b79da68e5cafe4a02fa0ff43bbe978da
-  data.tar.gz: f40fa598166f2da4684889d5070f7e8b88c5030ac07f358053e4660e4548f723
+  metadata.gz: 8e1bf6d4d8064ef174bbb91426340735a27f779f259ad3262886b90f6f3e3e88
+  data.tar.gz: 27f9fbc7cca9d2a9b86b8fcf533c4fe582e9f1014f960f10cb15edca80186c60
 SHA512:
-  metadata.gz: d494b5b7a1317c9191cab631120c4ec21893b6f020bf2d1706de9c70bf1929017c4af52f9d05146e43eda0f4312fec65bdf41b476ac35057514b3ec34f5be709
-  data.tar.gz: 17b65d57136c266eadfc3c9cb0bd2f8955a9e733d0662264fb77fbcc057e2a6651b4d1f9b8588fed5ffbb9e7050b0bfdee3c4f9abd69ab69392532b5024650ad
+  metadata.gz: 8ae1dd318e5ccd2a79902eb45f73a17a3238556e3cd0aa7b9e1e7f2c694c72d992d54a3f49eb65b9f0cee6c2df768b005372475ec50021c0eef882440c412dd2
+  data.tar.gz: 58253e1b90ea7642db64f9ce278ef00be20defffc6fbb007836a1c7eadfd6d48c81c532b4088c901e0975310c22f682e26c2387d3ac953c2bb6148ef8cb45160

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:2.0.0-rc"
+        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: "influx: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,9 +1,15 @@
 ## 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. [#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]
 
 ### API
- 1. [#15](https://github.com/influxdata/influxdb-plugin-fluent/pull/15): Default port changed from 9999 -> 8086
+1. [#15](https://github.com/influxdata/influxdb-plugin-fluent/pull/15): Default port changed from 9999 -> 8086
 
 ### Dependencies
 1. [#16](https://github.com/influxdata/influxdb-plugin-fluent/pull/16): Upgrade InfluxDB client to 1.8.0

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/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="2.0.0-rc"
+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:2.0.0-rc
+       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:2.0.0-rc
+       influxdb:latest
 
 #
 # Post onBoarding request to InfluxDB 2

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.729
+  version: 1.7.0.pre.960
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2021-03-04 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