fluent-plugin-influxdb-v2 1.7.0.pre.960 → 1.8.0.pre.1156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e1bf6d4d8064ef174bbb91426340735a27f779f259ad3262886b90f6f3e3e88
-  data.tar.gz: 27f9fbc7cca9d2a9b86b8fcf533c4fe582e9f1014f960f10cb15edca80186c60
+  metadata.gz: 1c4a018e78cb9e91efa9f1c46135c7196ac33b5ea7583596c8aad432a3a8e2cc
+  data.tar.gz: e8a9499c446e0b428bf1b1d36ea1530c018fca4eb3c80bffbc2a228919e17da5
 SHA512:
-  metadata.gz: 8ae1dd318e5ccd2a79902eb45f73a17a3238556e3cd0aa7b9e1e7f2c694c72d992d54a3f49eb65b9f0cee6c2df768b005372475ec50021c0eef882440c412dd2
-  data.tar.gz: 58253e1b90ea7642db64f9ce278ef00be20defffc6fbb007836a1c7eadfd6d48c81c532b4088c901e0975310c22f682e26c2387d3ac953c2bb6148ef8cb45160
+  metadata.gz: e9e67f6fa6fd3a0709da0261ba970de037097d6d90cb9971df55acc21f3dc57ea8a1273a4ed6f2c2d7773ca1b32298fa6e97b1a2f303d5ea199030458bce3f04
+  data.tar.gz: b48d5a01cbd5841d0fc9df6fe039369d30696392815082c6aa0c249129088117423b0233c17e5be05a5fcfec25acb4f3d4dbf5dcabe37c146aecae1cdcdc4413

data/CHANGELOG.md

@@ -1,10 +1,15 @@
-## 1.7.0 [unreleased]
+## 1.8.0 [unreleased]
 
 ### Features
-1. [#23](https://github.com/influxdata/influxdb-plugin-fluent/pull/23): Added possibility to specify the certification verification behaviour
+1. [#26](https://github.com/influxdata/influxdb-plugin-fluent/pull/26): Add placeholder support for bucket & measurement fields
+
+## 1.7.0 [2021-03-05]
+
+### Features
+1. [#23](https://github.com/influxdata/influxdb-plugin-fluent/pull/23): Add 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. [#24](https://github.com/influxdata/influxdb-plugin-fluent/pull/24): Updat stable image to `influxdb:latest` and nightly to `quay.io/influxdb/influxdb:nightly`
 
 ## 1.6.0 [2020-10-02]
 
@@ -16,7 +21,7 @@
 
 ## 1.5.0 [2020-07-17]
 
-1. [#12](https://github.com/influxdata/influxdb-plugin-fluent/pull/12): Renamed gem to `fluent-plugin-influxdb-v2`
+1. [#12](https://github.com/influxdata/influxdb-plugin-fluent/pull/12): Rename gem to `fluent-plugin-influxdb-v2`
 
 ### Dependencies
 1. [#11](https://github.com/influxdata/influxdb-plugin-fluent/pull/11): Upgrade InfluxDB client to 1.6.0
@@ -24,7 +29,7 @@
 ## 1.4.0 [2020-06-19]
 
 ### Features
-1. [#8](https://github.com/influxdata/influxdb-plugin-fluent/pull/8): Added support for nested fields
+1. [#8](https://github.com/influxdata/influxdb-plugin-fluent/pull/8): Add support for nested fields
 
 ### Dependencies
 1. [#9](https://github.com/influxdata/influxdb-plugin-fluent/pull/9): Upgrade InfluxDB client to 1.5.0

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

data/fluent-plugin-influxdb-v2.gemspec

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

data/lib/fluent/plugin/out_influxdb2.rb

@@ -119,7 +119,7 @@ class InfluxDBOutput < Fluent::Plugin::Output
   def write(chunk)
     points = []
     tag = chunk.metadata.tag
-    measurement = @measurement || tag
+    bucket, measurement = expand_placeholders(chunk)
     chunk.msgpack_each do |time, record|
       if time.is_a?(Integer)
         time_formatted = time
@@ -141,12 +141,22 @@ class InfluxDBOutput < Fluent::Plugin::Output
       point.time(time_formatted, @precision)
       points << point
     end
-    @write_api.write(data: points)
+    @write_api.write(data: points, bucket: bucket)
     log.debug "Written points: #{points}"
   end
 
   private
 
+  def expand_placeholders(chunk)
+    bucket = extract_placeholders(@bucket, chunk)
+    measurement = if @measurement
+                    extract_placeholders(@measurement, chunk)
+                  else
+                    chunk.metadata.tag
+                  end
+    [bucket, measurement]
+  end
+
   def _parse_field(key, value, point)
     if @tag_keys.include?(key)
       point.add_tag(key, value)

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

@@ -475,4 +475,39 @@ class InfluxDBOutputTest < Minitest::Test
     driver.feed(time, data)
     time
   end
+
+  def test_bucket_as_placeholder
+    stub_request(:any, 'https://localhost:8086/api/v2/write?bucket=placeholder_h2o_tag&org=my-org&precision=ns')
+      .to_return(status: 204)
+    driver = create_driver(%(
+      @type influxdb2
+      token my-token
+      bucket placeholder_${tag}
+      org my-org
+      time_precision ns
+    ))
+    driver.run(default_tag: 'h2o_tag') do
+      emit_documents(driver)
+    end
+    assert_requested(:post, 'https://localhost:8086/api/v2/write?bucket=placeholder_h2o_tag&org=my-org&precision=ns',
+                     times: 1, body: 'h2o_tag level=2i,location="europe" 1444897215000000000')
+  end
+
+  def test_measurement_as_placeholder
+    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
+      measurement placeholder_${tag}
+    ))
+    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: 1, body: 'placeholder_h2o_tag level=2i,location="europe" 1444897215000000000')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-influxdb-v2
 version: !ruby/object:Gem::Version
-  version: 1.7.0.pre.960
+  version: 1.8.0.pre.1156
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0.pre.1894
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0.pre.1894
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: InfluxDB 2 output plugin for Fluentd