fluent-plugin-kubernetes-metrics 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d045b836c1441d1472ebe35ffed305974a6c6cb438f28bc5d9c9d04cb205808f
-  data.tar.gz: 6828329da0a99066abccb55b72c64c5d69f4e2b281d8834767eb5ce896ed9514
+  metadata.gz: c8cc8ed0ac2d0a4e52276aef23ec9e9cebb7659d9d2d1ad8bce83f9d88a4220c
+  data.tar.gz: c22c687bfc5ea76e5f3ee70a0f4aa0838af5e83e8b6a939faff4e0f34b84e2ae
 SHA512:
-  metadata.gz: 4f0f254bcf6d823a95478780df14aa7ddccbfc07849c36373b86f79c995167625b7872d7a193352ffad4b14c3b92b824f6344aeb4d92a3c6f6edc93bbdeda567
-  data.tar.gz: bbb2bbdc5b8a6ae48cc8e0e8f159a69c58a715e270d3275e8030878f2dcffb14cb999f1347bf07dc33092db7c05b348b03e14d57e45131fa012253140f4dcd61
+  metadata.gz: 4c9425096d61afd78cee9a42169e74d2f22dd8512699fe960b92b0b8ceffa72de0a2b09ab9b811fcbcd6f11085a6c7f32259e95fd1da92d1cd0507b22ce3f99b
+  data.tar.gz: 8c7e6f37ea8134cda37bd52347f5cacee5c8d8b9c84a75c899b0938551a027cf737816892ce1156f7f6f215679c05b85d6c3256546b3051be4e659aa0d68ff4f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-metrics (1.2.0)
+    fluent-plugin-kubernetes-metrics (1.2.1)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.9.3)
       multi_json (~> 1.14)
@@ -23,7 +23,7 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.15.1)
+    fluentd (1.15.3)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.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.4)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     netrc (0.11.0)
-    oj (3.13.20)
+    oj (3.13.23)
     power_assert (2.0.1)
     public_suffix (4.0.6)
     rake (13.0.6)
@@ -86,7 +86,7 @@ GEM
       power_assert
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.2)
+    tzinfo-data (1.2022.6)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -110,4 +110,4 @@ DEPENDENCIES
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.3.20
+   2.3.26

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

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/"

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.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -180,6 +180,6 @@ signing_key:
 specification_version: 4
 summary: A fluentd input plugin that collects kubernetes cluster metrics.
 test_files:
-- test/plugin/test_missing_timestamps.rb
 - test/plugin/test_in_kubernetes_metrics.rb
+- test/plugin/test_missing_timestamps.rb
 - test/helper.rb