influxdb-plugin-fluent 1.3.0.pre.345 → 1.4.0.pre.497

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d548430a940f69793c4cccf596c7f88ec6454c9440f556a62b0dec48b84e554
-  data.tar.gz: 6d5cb461cd9ccad3fbb2b669076799e0448b97169a53ccee54a76c50aa68db42
+  metadata.gz: e02ded22bb53c91121089eb95d644da022510bdce638dc809bf4110f0191b10c
+  data.tar.gz: 406f55e543323cbc4a5f5ba7dc966846ed6309c006294625ab00d17d715202ae
 SHA512:
-  metadata.gz: d2cfdc82df337c4f1027113e6d03a9fa976b28acaa687edd62558298b33df407b952df90002848214a4407821c9b7b8576234538d7415dadf3c1961571f569b8
-  data.tar.gz: f9509309bc8c563b7b00ae3ed77ce78a47a17d30439989dced4da919398dc5cd9541a0e64467909de0d4d6e376ca57a866fb029f887e784ef7ffd997ea56db25
+  metadata.gz: 9549c858749f812597b747b286f0476c07dc69af46a26600f147cb637f32f9e91de4906c1f263d615dc142ccc3fc80e0ab820888e22792ee1765df3976bec079
+  data.tar.gz: 1792a00de281f6a6f4e65e9c7e48850405404e5b4c610632bf5f000e547b405c115c47c11a8cf0791e73646aba7ae34897c005fe7734654dc0ccf892edc92c28

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.3.0 [unreleased]
+## 1.4.0 [unreleased]
+
+### 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]
+
+### Dependencies
+1. [#6](https://github.com/influxdata/influxdb-plugin-fluent/pull/6): Upgrade InfluxDB client to 1.4.0
 
 ## 1.2.0 [2020-03-13]
 

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.2.0
+fluent-gem install influxdb-plugin-fluent -v 1.3.0
 ```
 
 ## Plugins

data/influxdb-plugin-fluent.gemspec

@@ -47,7 +47,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.2.0'
+  spec.add_runtime_dependency 'influxdb-client', '1.5.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'codecov', '~> 0.1.16'

data/lib/fluent/plugin/out_influxdb2.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require 'fluent/plugin/output'
-require 'influxdb2/client'
+require 'influxdb-client'
 
 # A buffered output plugin for Fluentd and InfluxDB 2
 class InfluxDBOutput < Fluent::Plugin::Output
@@ -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.3.0'.freeze
+      VERSION = '1.4.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.3.0.pre.345
+  version: 1.4.0.pre.497
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement