fluent-plugin-kubernetes-metrics 1.1.12 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ae3ba83383e096cdcfc581bf50d68f832c51887e6855180cbdee1edd49ddcd
-  data.tar.gz: 9556c5b920f6b1b375fefd39916ffd28ee3938daeed6879595c76f6ed4b00bed
+  metadata.gz: c8cc8ed0ac2d0a4e52276aef23ec9e9cebb7659d9d2d1ad8bce83f9d88a4220c
+  data.tar.gz: c22c687bfc5ea76e5f3ee70a0f4aa0838af5e83e8b6a939faff4e0f34b84e2ae
 SHA512:
-  metadata.gz: d27837d1f6a1dbaf59d08d3c5e2b815ff7f841431ffdae1a1ff535d3a689330ebc66b63b7d8626129e2a5745c11ac84886f8afc56885bac77253a2b2c3af30d6
-  data.tar.gz: cae074b32b2b7ee35e93b37990ced26a69c96760f5e0a94e0875f2d731a1491d3638e4782062087e4ef183709b3c28c984c376a681a9cadd37dcc89c1159bcc3
+  metadata.gz: 4c9425096d61afd78cee9a42169e74d2f22dd8512699fe960b92b0b8ceffa72de0a2b09ab9b811fcbcd6f11085a6c7f32259e95fd1da92d1cd0507b22ce3f99b
+  data.tar.gz: 8c7e6f37ea8134cda37bd52347f5cacee5c8d8b9c84a75c899b0938551a027cf737816892ce1156f7f6f215679c05b85d6c3256546b3051be4e659aa0d68ff4f

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.12)
+    fluent-plugin-kubernetes-metrics (1.2.1)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.9.3)
-      multi_json (~> 1.14.1)
-      oj (~> 3.10.2)
+      multi_json (~> 1.14)
+      oj (~> 3.10)
 
 GEM
   remote: https://rubygems.org/
@@ -23,12 +23,12 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.14.6)
+    fluentd (1.15.3)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.2.5, < 3.0.0)
+      serverengine (>= 2.3.0, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
@@ -42,14 +42,14 @@ GEM
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.8.0)
     json (2.6.1)
-    jsonpath (1.1.0)
+    jsonpath (1.1.2)
       multi_json
     kubeclient (4.9.3)
       http (>= 3.0, < 5.0)
@@ -59,10 +59,10 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    msgpack (1.5.1)
-    multi_json (1.14.1)
+    msgpack (1.6.0)
+    multi_json (1.15.0)
     netrc (0.11.0)
-    oj (3.10.18)
+    oj (3.13.23)
     power_assert (2.0.1)
     public_suffix (4.0.6)
     rake (13.0.6)
@@ -73,7 +73,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    serverengine (2.2.5)
+    serverengine (2.3.0)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.16.1)
@@ -84,19 +84,19 @@ GEM
     strptime (0.2.5)
     test-unit (3.3.9)
       power_assert
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.1)
+    tzinfo-data (1.2022.6)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     webrick (1.7.0)
-    yajl-ruby (1.4.2)
+    yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby
@@ -110,4 +110,4 @@ DEPENDENCIES
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.3.12
+   2.3.26

data/VERSION

@@ -1 +1 @@
-1.1.12
+1.2.1

data/fluent-plugin-kubernetes-metrics.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 3.5.1'
   spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
   spec.add_runtime_dependency 'kubeclient', '~> 4.9.3'
-  spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
-  spec.add_runtime_dependency 'oj', '~> 3.10.2'
+  spec.add_runtime_dependency 'multi_json', '~> 1.14'
+  spec.add_runtime_dependency 'oj', '~> 3.10'
 end

data/lib/fluent/plugin/in_kubernetes_metrics.rb

@@ -17,6 +17,7 @@ require 'time'
 require 'fluent/plugin/input'
 require 'kubeclient'
 require 'multi_json'
+require 'resolv'
 
 module Fluent
   module Plugin
@@ -76,6 +77,8 @@ module Fluent
       def configure(conf)
         super
 
+        @kubelet_address = "[#{@kubelet_address}]" if @kubelet_address =~ Resolv::IPv6::Regex
+
         if @use_rest_client
           raise Fluentd::ConfigError, 'node_name is required' if @node_name.nil? || @node_name.empty?
         else
@@ -136,6 +139,7 @@ module Fluent
         if @kubernetes_url.nil?
           # Use Kubernetes default service account if we're in a pod.
           env_host = ENV['KUBERNETES_SERVICE_HOST']
+          env_host = "[#{env_host}]" if env_host =~ Resolv::IPv6::Regex
           env_port = ENV['KUBERNETES_SERVICE_PORT']
           if env_host && env_port
             @kubernetes_url = "https://#{env_host}:#{env_port}/api/"
@@ -166,7 +170,7 @@ module Fluent
         }
 
         auth_options = {}
-        auth_options[:bearer_token] = File.read(@bearer_token_file) if @bearer_token_file
+        auth_options[:bearer_token_file] = @bearer_token_file if @bearer_token_file
 
         @client = Kubeclient::Client.new(
           @kubernetes_url, 'v1',
@@ -244,6 +248,11 @@ module Fluent
         ssl_options
       end
 
+      # This method is used to refresh the authorization token for kubeclient
+      def update_kubeclient_header
+        @client.headers[:Authorization] = 'Bearer ' + File.read(@bearer_token_file) if @bearer_token_file
+      end
+
       # This method is used to set the options for sending a request to the kubelet api
       def request_options
         options = { method: 'get', url: @kubelet_url }
@@ -677,6 +686,7 @@ module Fluent
           response = RestClient::Request.execute request_options
           handle_response(response)
         else
+          update_kubeclient_header
           @node_names.each do |node|
             response = summary_proxy_api(node).get(@client.headers)
             handle_response(response)
@@ -688,6 +698,7 @@ module Fluent
         if @use_rest_client
           response_stats = RestClient::Request.execute request_options_stats
         else
+          update_kubeclient_header
           @node_names.each do |node|
             @node_name = node
             response_stats = stats_proxy_api(node).get(@client.headers)
@@ -703,6 +714,7 @@ module Fluent
           response_stats = RestClient::Request.execute request_options_stats
           handle_stats_response(response_stats)
         else
+          update_kubeclient_header
           @node_names.each do |node|
             @node_name = node
             response_stats = stats_proxy_api(node).get(@client.headers)
@@ -716,6 +728,7 @@ module Fluent
           response_cadvisor = RestClient::Request.execute cadvisor_request_options
           handle_cadvisor_response(response_cadvisor)
         else
+          update_kubeclient_header
           @node_names.each do |node|
             response_cadvisor = cadvisor_proxy_api(node).get(@client.headers)
             handle_cadvisor_response(response_cadvisor)

data/metrics-information.md

@@ -1,6 +1,6 @@
 # Metrics Information
 
-## The foillowing table describes common terminology used in this topic.
+## The following table describes common terminology used in this topic.
 
 | Terminology | Definition |
 | ---	| ---	|

data/test/plugin/test_in_kubernetes_metrics.rb

@@ -109,6 +109,30 @@ class KubernetesMetricsInputTest < Test::Unit::TestCase
     assert_equal true, d.instance.use_rest_client
   end
 
+  test 'IPv6 node configuration' do
+    IPv6_CONFIG = %(
+      type kubernetes_metrics
+      node_name generics-aws-node-name
+      tag kube.*
+      insecure_ssl true
+      interval 10s
+      use_rest_client true
+      use_rest_client_ssl false
+      kubelet_port 10_255
+      kubelet_address fd55:4d62:e00f::1
+    )
+    assert_nothing_raised(Fluent::ConfigError) do
+      create_driver(IPv6_CONFIG)
+    end
+
+    d = create_driver(IPv6_CONFIG)
+    assert_equal '[fd55:4d62:e00f::1]', d.instance.kubelet_address
+    assert_equal 'http://[fd55:4d62:e00f::1]:10255/stats/summary', d.instance.instance_variable_get('@kubelet_url')
+    assert_equal 'http://[fd55:4d62:e00f::1]:10255/stats', d.instance.instance_variable_get('@kubelet_url_stats')
+    assert_equal 'http://[fd55:4d62:e00f::1]:10255/metrics/cadvisor', d.instance.instance_variable_get('@cadvisor_url')
+
+  end
+
   sub_test_case 'node_unit_tests' do
     test 'test_emit_cpu_metrics' do
       assert_not_nil @@hash_map_test.key?('kube.node.cpu.usage')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes-metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.2.1
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.1
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.2
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.2
+        version: '3.10'
 description: A fluentd input plugin that collects node and container metrics from
   a kubernetes cluster.
 email:
@@ -180,6 +180,6 @@ signing_key:
 specification_version: 4
 summary: A fluentd input plugin that collects kubernetes cluster metrics.
 test_files:
-- test/helper.rb
-- test/plugin/test_missing_timestamps.rb
 - test/plugin/test_in_kubernetes_metrics.rb
+- test/plugin/test_missing_timestamps.rb
+- test/helper.rb