influxdb-plugin-fluent 1.4.0.pre.435 → 1.5.0.pre.563

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4b8e2ac011c9d9c3780c899325c2cf50d94c9ccc63d5c53b8be11e684bae26
-  data.tar.gz: 6387b6209adb43985bbf5e6f152a1c2b4a2c3cfe0713c46fbf8d17ee6e5a1873
+  metadata.gz: 973f288a15c06fa35e0b29ed53f2f706223e51f0557b92e7e7f3436e2a93991e
+  data.tar.gz: 8506d54df262e5362098cdf985a1fc90dd2ed6ecf4ee96fef993b3e8484d7335
 SHA512:
-  metadata.gz: 58bd834b73a02c53bec906d7d30a3fa575dfa7982060b70195c3b313cf145535cb76983ba2a691e7820817ed45525cacab408d689f6549eba8fb8c9007a9d2f5
-  data.tar.gz: 20c1408758e91560c844f4695924b136fa7067b7ba294861dcd102368e3e8a4d0da5e2ebfccd9ec570fccca6a7272a6c1eacd8251fb6e113ded8e93b14261e49
+  metadata.gz: 78fcd35fb3980f3a14e4d6d36e2e080b64dc9b6ad0562b913030a81f3818bde03105665663ef3120f7caaec3ae4e0edd04254515be600ba326a09120453898d4
+  data.tar.gz: 25061fb356a9ffa69a640a627bf80e7bc4b203556caf8c12f2971840e4f12d4ea805cb7d60d1b9cfa6ecd97e57c8d118723d17fad422a15595b36b423591db8e

data/.rubocop.yml

@@ -23,9 +23,9 @@
 Metrics/LineLength:
   Max: 120
 Metrics/MethodLength:
-  Max: 40
+  Max: 50
 Metrics/ClassLength:
-  Max: 350
+  Max: 500
 Metrics/AbcSize:
   Max: 40
 Metrics/BlockLength:

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-## 1.4.0 [unreleased]
+## 1.5.0 [unreleased]
+
+### Dependencies
+1. [#11](https://github.com/influxdata/influxdb-plugin-fluent/pull/11): Upgrade InfluxDB client to 1.6.0
+
+## 1.4.0 [2020-06-19]
+
+### Features
+1. [#8](https://github.com/influxdata/influxdb-plugin-fluent/pull/8): Added support for nested fields
+
+### Dependencies
+1. [#9](https://github.com/influxdata/influxdb-plugin-fluent/pull/9): Upgrade InfluxDB client to 1.5.0
 
 ## 1.3.0 [2020-05-15]
 

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/influxdb-plugin-fluent).  You can install the gem as follows:
 
 ```
-fluent-gem install influxdb-plugin-fluent -v 1.3.0
+fluent-gem install influxdb-plugin-fluent -v 1.4.0
 ```
 
 ## Plugins

data/influxdb-plugin-fluent.gemspec

@@ -33,7 +33,8 @@ Gem::Specification.new do |spec|
   spec.email         = ['jakub.bednar@gmail.com']
 
   spec.summary       = 'InfluxDB 2 output plugin for Fluentd'
-  spec.description   = 'A buffered output plugin for Fluentd and InfluxDB 2'
+  spec.description   = 'The gem is renamed to fluent-plugin-influxdb-v2. '\
+'A buffered output plugin for Fluentd and InfluxDB 2'
   spec.homepage      = 'https://github.com/influxdata/influxdb-plugin-fluent'
   spec.license       = 'MIT'
 
@@ -47,7 +48,7 @@ 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.4.0'
+  spec.add_runtime_dependency 'influxdb-client', '1.6.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'codecov', '~> 0.1.16'

data/lib/fluent/plugin/out_influxdb2.rb

@@ -128,14 +128,8 @@ class InfluxDBOutput < Fluent::Plugin::Output
       record.each_pair do |k, v|
         if k.eql?(@time_key)
           time_formatted = v
-        elsif @tag_keys.include?(k)
-          point.add_tag(k, v)
-        elsif @field_keys.empty? || @field_keys.include?(k)
-          if @field_cast_to_float & v.is_a?(Integer)
-            point.add_field(k, Float(v))
-          else
-            point.add_field(k, v)
-          end
+        else
+          _parse_field(k, v, point)
         end
         point.add_tag('fluentd', tag) if @tag_fluentd
       end
@@ -145,4 +139,22 @@ class InfluxDBOutput < Fluent::Plugin::Output
     @write_api.write(data: points)
     log.debug "Written points: #{points}"
   end
+
+  private
+
+  def _parse_field(key, value, point)
+    if @tag_keys.include?(key)
+      point.add_tag(key, value)
+    elsif @field_keys.empty? || @field_keys.include?(key)
+      if @field_cast_to_float & value.is_a?(Integer)
+        point.add_field(key, Float(value))
+      elsif value.is_a?(Hash)
+        value.each_pair do |nested_k, nested_v|
+          _parse_field("#{key}.#{nested_k}", nested_v, point)
+        end
+      else
+        point.add_field(key, value)
+      end
+    end
+  end
 end

data/lib/fluent/plugin/version.rb

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

data/test/influxdb/plugin/output_test.rb

@@ -363,6 +363,78 @@ class InfluxDBOutputTest < Minitest::Test
                      times: 1, body: 'h2o_tag level=2.0,location="europe" 1444897215000000000')
   end
 
+  def test_nested_field
+    stub_request(:any, 'https://localhost:9999/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
+    ))
+    driver.run(default_tag: 'h2o_tag') do
+      emit_documents(driver, 'location' => 'europe', 'level' => 2,
+                             'nest' => { 'key' => 'nested value', 'deep' => { 'deep-key' => 'deep-value' }, 'a' => 25 })
+    end
+    body = 'h2o_tag level=2i,location="europe",nest.a=25i,nest.deep.deep-key="deep-value",nest.key="nested value" ' \
+'1444897215000000000'
+    assert_requested(:post, 'https://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: body)
+  end
+
+  def test_kubernetes_structure
+    record = {
+      'docker' => { 'container_id' => '7ee0723e90d13df5ade6f5d524f23474461fcfeb48a90630d8b02b13c741550b' },
+      'kubernetes' => { 'container_name' => 'fluentd',
+                        'namespace_name' => 'default',
+                        'pod_name' => 'fluentd-49xk2',
+                        'container_image' => 'rawkode/fluentd:1',
+                        'container_image_id' =>
+                            'docker://sha256:90c288b8a09cc6ae98b04078afb10d9c380c0603a47745403461435073460f97',
+                        'pod_id' => 'c15ab1cb-0773-4ad7-a58b-f791ab34c62f',
+                        'host' => 'minikube',
+                        'labels' => {
+                          'controller-revision-hash' => '57748799f7',
+                          'pod-template-generation' => 2,
+                          'app_kubernetes_io/instance' => 'fluentd',
+                          'app_kubernetes_io/name' => 'fluentd'
+                        },
+                        'master_url' => 'https://10.96.0.1:443/api',
+                        'namespace_id' => '2b0bc75c-323a-4f04-9eec-02255a8d0044' },
+      'log' => '2020-06-17 13:19:42 +0000 [info]: #0 [filter_kube_metadata] stats - namespace_cache_size: 2, '\
+'pod_cache_size: 6, pod_cache_watch_updates: 1, namespace_cache_api_updates: 6, '\
+'pod_cache_api_updates: 6, id_cache_miss: 6\n',
+      'stream' => 'stdout'
+    }
+
+    stub_request(:any, 'https://localhost:9999/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
+    ))
+    driver.run(default_tag: 'h2o_tag') do
+      emit_documents(driver, record)
+    end
+    body = 'h2o_tag docker.container_id="7ee0723e90d13df5ade6f5d524f23474461fcfeb48a90630d8b02b13c741550b",'\
+'kubernetes.container_image="rawkode/fluentd:1",'\
+'kubernetes.container_image_id="docker://sha256:90c288b8a09cc6ae98b04078afb10d9c380c0603a47745403461435073460f97",'\
+'kubernetes.container_name="fluentd",kubernetes.host="minikube",'\
+'kubernetes.labels.app_kubernetes_io/instance="fluentd",kubernetes.labels.app_kubernetes_io/name="fluentd",'\
+'kubernetes.labels.controller-revision-hash="57748799f7",kubernetes.labels.pod-template-generation=2i,'\
+'kubernetes.master_url="https://10.96.0.1:443/api",kubernetes.namespace_id="2b0bc75c-323a-4f04-9eec-02255a8d0044",'\
+'kubernetes.namespace_name="default",kubernetes.pod_id="c15ab1cb-0773-4ad7-a58b-f791ab34c62f",'\
+'kubernetes.pod_name="fluentd-49xk2",log="2020-06-17 13:19:42 +0000 [info]: #0 [filter_kube_metadata] stats - '\
+'namespace_cache_size: 2, pod_cache_size: 6, pod_cache_watch_updates: 1, namespace_cache_api_updates: 6, '\
+'pod_cache_api_updates: 6, id_cache_miss: 6\\\n",stream="stdout" 1444897215000000000'
+    assert_requested(:post, 'https://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: body)
+  end
+
   def emit_documents(driver, data = { 'location' => 'europe', 'level' => 2 })
     time = event_time('2015-10-15 8:20:15 UTC')
     driver.feed(time, data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-plugin-fluent
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.435
+  version: 1.5.0.pre.563
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-description: A buffered output plugin for Fluentd and InfluxDB 2
+description: The gem is renamed to fluent-plugin-influxdb-v2. A buffered output plugin
+  for Fluentd and InfluxDB 2
 email:
 - jakub.bednar@gmail.com
 executables: []