fluent-plugin-k8s-metrics-agg 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d80783bf51707cd2587e12afab8b264a772a15f2ac8e28357a7cfbf7db756735
-  data.tar.gz: de12ab83988f0d07a7c50f875896915fd87f824222cd8c2ae4ce05c81e1dfa1c
+  metadata.gz: 4f92eb632c964a3ff42ffbf5bb5e80e88ef09214450b675e5ec266a9151a0586
+  data.tar.gz: '033804f772a66cf391951612128d3ed59ecbb9691217a1eb3891c761e55fbdca'
 SHA512:
-  metadata.gz: 04010cd42dc57248e834edfdcc694f6b6b85297d2f94d3a9d7f5230c4d135f3865105dd98ead308fb061e8b450bd6a350e8b2e65e060d32536c0a43f7404adf7
-  data.tar.gz: 80c89f87b2bcb000b595361d65e8f1b1dfb539c0314251aded423ed81b10c3b5ec492d7f8eb600ec18d8e3554833ecf4531cfc8a8542352701de24c5be2742c7
+  metadata.gz: 314ae9748bb11976c330e7cb60c7d8e854aad7c3e289dd5fd03fa3c4ceb6151f992725493a9278fd57111458ff13f7a93a076bd87d9bc3aa2a94797be018c64e
+  data.tar.gz: a135a3453e6138e7395dad5c003ff6e53cf8a19920cb7794c26cb69e56a79a7db6060e44cb3437059136666c8a7653dbcff0c200b29c78ad31e0c4037bebf562

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-k8s-metrics-agg (1.2.0)
+    fluent-plugin-k8s-metrics-agg (1.2.2)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.9.3)
       multi_json (~> 1.14.1)
@@ -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,7 +59,7 @@ 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.14.1)
     netrc (0.11.0)
     oj (3.10.18)
@@ -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.4.9

data/README.md

@@ -1,3 +1,7 @@
+# End of Support
+
+**Important:** The fluent-plugin-k8s-metrics-agg will reach End of Support on January 1, 2024. After that date, this repository will no longer receive updates from Splunk and will no longer be supported by Splunk. Until then, only critical security fixes and bug fixes will be provided.
+
 # Fluentd Plugin for Kubernetes Metrics - Aggregator
 
 [Fluentd](https://fluentd.org/) input plugin collects kubernetes cluster metrics from the kubeapiserver API. The API is exposed by [KubeApiServer](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/) on a kubernetes cluster.

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.2

data/docker/Dockerfile

@@ -46,7 +46,8 @@ RUN yum update -y \
 RUN groupadd -r $FLUENT_USER && \
   useradd -r -g $FLUENT_USER $FLUENT_USER && \
   mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins &&\
-  chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd
+  chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd && \
+  chmod +t /tmp
 
 USER $FLUENT_USER
 CMD bundle exec fluentd -c /fluentd/etc/fluent.conf

data/docker/Gemfile

@@ -11,8 +11,8 @@ gem "oj", "~>3.10"
 gem 'multi_json', '~>1.14'
 gem 'http_parser.rb', '=0.8.0'
 gem 'bigdecimal', '=3.0.0'
-gem 'rack', '>= 2.2.3.1'
+gem 'rack', '>= 3.0.0'
 
-gem "fluent-plugin-splunk-hec", "= 1.3.0"
+gem "fluent-plugin-splunk-hec", "= 1.3.2"
 
 gem 'fluent-plugin-k8s-metrics-agg', path: 'gem/'

data/docker/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: gem
   specs:
-    fluent-plugin-k8s-metrics-agg (1.2.0)
+    fluent-plugin-k8s-metrics-agg (1.2.2)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.9.3)
       multi_json (~> 1.14.1)
@@ -10,9 +10,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activesupport (7.0.3.1)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -22,12 +22,18 @@ GEM
     aes_key_wrap (1.1.0)
     attr_required (1.0.1)
     bigdecimal (3.0.0)
-    bindata (2.4.10)
+    bindata (2.4.14)
     concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    connection_pool (2.3.0)
     cool.io (1.7.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    faraday (2.7.1)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -37,13 +43,15 @@ GEM
       prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.1.0)
       fluentd (>= 1.0, < 2)
-    fluent-plugin-splunk-hec (1.3.0)
+    fluent-plugin-splunk-hec (1.3.2)
       fluentd (>= 1.5)
+      json-jwt (~> 1.15.0)
       multi_json (~> 1.13)
       net-http-persistent (~> 4.0)
       openid_connect (~> 1.1.8)
       prometheus-client (>= 2.1.0)
-    fluentd (1.15.1)
+      rack-oauth2 (~> 1.19)
+    fluentd (1.15.3)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -70,7 +78,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json-jwt (1.15.2)
+    json-jwt (1.15.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
@@ -88,8 +96,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    minitest (5.16.2)
-    msgpack (1.5.4)
+    minitest (5.16.3)
+    msgpack (1.6.0)
     multi_json (1.14.1)
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
@@ -107,8 +115,8 @@ GEM
       webfinger (>= 1.0.1)
     prometheus-client (4.0.0)
     public_suffix (4.0.7)
-    rack (2.2.3.1)
-    rack-oauth2 (1.21.2)
+    rack (3.0.6.1)
+    rack-oauth2 (1.21.3)
       activesupport
       attr_required
       httpclient
@@ -121,17 +129,19 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    ruby2_keywords (0.0.5)
     serverengine (2.3.0)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.5)
-    swd (1.3.0)
+    swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     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
@@ -142,9 +152,10 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    webfinger (1.2.0)
+    webfinger (2.1.2)
       activesupport
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     webrick (1.7.0)
     yajl-ruby (1.4.3)
 
@@ -156,13 +167,13 @@ DEPENDENCIES
   fluent-plugin-k8s-metrics-agg!
   fluent-plugin-prometheus (>= 2.0)
   fluent-plugin-record-modifier (= 2.1.0)
-  fluent-plugin-splunk-hec (= 1.3.0)
+  fluent-plugin-splunk-hec (= 1.3.2)
   fluentd (>= 1.15)
   http_parser.rb (= 0.8.0)
   kubeclient (= 4.9.3)
   multi_json (~> 1.14)
   oj (~> 3.10)
-  rack (>= 2.2.3.1)
+  rack (>= 3.0.0)
 
 BUNDLED WITH
    2.1.4

data/lib/fluent/plugin/in_kubernetes_metrics_aggregator.rb

@@ -15,6 +15,7 @@ require 'time'
 require 'fluent/plugin/input'
 require 'kubeclient'
 require 'multi_json'
+require 'resolv'
 module Fluent
   module Plugin
     class KubernetesMetricsAggregatorInput < Fluent::Plugin::Input
@@ -211,6 +212,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_final = "https://#{env_host}:#{env_port}/api/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-k8s-metrics-agg
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler