fluent-plugin-influxdb-v2 1.8.0.pre.1021 → 1.9.0.pre.1209

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a184ab7f5812ee9974db610247187bbca47080079f3ffb610b535797b28d1c5
-  data.tar.gz: 97fbf1e06efc6728673cbd2e35f5a2ef5639e54fa09e0fa260b811810dd0dc73
+  metadata.gz: b407d41fb5654f68fb0e20c644516d23ae03d8cd20ee1782d48915d464f21592
+  data.tar.gz: 6e643a4848081996dea34367949a362da8ed96f65ebe82ecd28091f91e148729
 SHA512:
-  metadata.gz: 86004d977d07877bf268fa1b79f4645c396ca10be5c4474dbacc8c81cc43aa87a236b218424906f3f452f210aa9f6d5ab0aef710dffe7e978773b853fe29649c
-  data.tar.gz: 8bf932e88c5fbfb30451f8f807cf1f9ae0275a7cd8089d9379aee09538e080563b95ea281e200932add3efeb62c619f2a5cbff620b99c46f605fd6d3e1f28207
+  metadata.gz: 5458e096b8c9375095056f367451f4fb681a642776d622bd1e6536674c67bd9f8d823c007330d2806a0dd64be9f970014d9b01c59370ba3b4f3eaaa9e47a725f
+  data.tar.gz: dadf7c323827adaac002f3d8f094150e92e6bb861e33299585d45f2b46704c91622e19ee31163ba6644c5e9d6cd9bacf1e11c50d1d4bd357e1c8d27596341110

data/.circleci/config.yml

@@ -41,9 +41,9 @@ commands:
       - restore_cache:
           name: Restoring Gem Cache
           keys:
-            - &cache-key gem-cache-{{ checksum "fluent-plugin-influxdb-v2.gemspec" }}-<< parameters.ruby-image >>
-            - gem-cache-{{ checksum "fluent-plugin-influxdb-v2.gemspec" }}
-            - gem-cache-
+            - &cache-key gem-cache-v2-{{ checksum "fluent-plugin-influxdb-v2.gemspec" }}-<< parameters.ruby-image >>
+            - gem-cache-v2-{{ checksum "fluent-plugin-influxdb-v2.gemspec" }}
+            - gem-cache-v2-
       - run:
           name: Install dependencies
           command: |
@@ -75,7 +75,7 @@ jobs:
     parameters:
       ruby-image:
         type: string
-        default: &default-ruby-image "circleci/ruby:2.6-stretch"
+        default: &default-ruby-image "cimg/ruby:2.6"
       influxdb-image:
         type: string
         default: &default-influxdb-image "influxdb:latest"
@@ -119,7 +119,7 @@ workflows:
     jobs:
       - tests-ruby:
           name: ruby-2.7
-          ruby-image: "circleci/ruby:2.7-buster"
+          ruby-image: "cimg/ruby:2.7"
       - tests-ruby:
           name: ruby-2.6
       - tests-ruby:
@@ -127,10 +127,10 @@ workflows:
           influxdb-image: "quay.io/influxdb/influxdb:nightly"
       - tests-ruby:
           name: ruby-2.5
-          ruby-image: "circleci/ruby:2.5-stretch"
+          ruby-image: "cimg/ruby:2.5"
       - tests-ruby:
           name: ruby-2.4
-          ruby-image: "circleci/ruby:2.4-stretch"
+          ruby-image: "cimg/ruby:2.4"
       - deploy-preview:
           requires:
             - ruby-2.7

data/CHANGELOG.md

@@ -1,12 +1,20 @@
-## 1.8.0 [unreleased]
+## 1.9.0 [unreleased]
+
+### CI
+1. [#27](https://github.com/influxdata/influxdb-plugin-fluent/pull/27): Switch to next-gen CircleCI's convenience images
+
+## 1.8.0 [2021-08-20]
+
+### Features
+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): Added possibility to specify the certification verification behaviour
+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]
 
@@ -18,7 +26,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
@@ -26,7 +34,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.7.0
+fluent-gem install fluent-plugin-influxdb-v2 -v 1.8.0
 ```
 
 ## Plugins

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.8.0'.freeze
+      VERSION = '1.9.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.8.0.pre.1021
+  version: 1.9.0.pre.1209
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -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.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: InfluxDB 2 output plugin for Fluentd