fluent-plugin-k8s-metrics-agg 1.1.12 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2f3bb6503bba97da9447d76d92c2d7c74e8c945b1e3ef47f14798ebbe9b739
-  data.tar.gz: d77545222c199151249bc6925ae0f74a085b564263004a898c8342bc1d4c88bc
+  metadata.gz: 565444ab4272096fd6512f642d8316a757e0b4e4db092495dc238315f75090a0
+  data.tar.gz: a7c63569ce9fae8178319caa8e89c8c4927f153d5a36ae2a98bf1cee7eec2836
 SHA512:
-  metadata.gz: 5c2df1c502cf7770684340151f09771ea9651d042359f026708677792539af870ca185aee0ecc9e56a54ea2e19f4de9a51f4c6b9a2e06b1846dc3149a396f45c
-  data.tar.gz: f6865ac8416c44d4c221e49f8a26ae1e88776094414b0847d2c6cbc77499d76c120cf12631c18145e89388116c8c3d5aac12bdcb5baefe09676ef50b650f2db6
+  metadata.gz: 9d0e86b6d56f3ddbcbe94141a3263568b4640c189ebd6ed759dd738b619ae47800d91714e70d683eaa1b909b4cbc553d6aaa60263ed803c327b6cfb759fc6003
+  data.tar.gz: 7be1e3c1c52566ae81f6c5a7deaa7d79a999f27e44b43e1a83d3f2962556776aba87468dd3fdab818076c16c7fbcb389581a2fdf5dc2016ec1ddda986fff2d52

data/.fossa.yml

@@ -0,0 +1,5 @@
+version: 3
+server: https://app.fossa.com
+project:
+  id: "fluent-plugin-k8s-metrics-agg"
+  team: "TA-Automation"

data/.github/workflows/ci_build_test.yaml

@@ -194,3 +194,36 @@ jobs:
           	--splunk-password $CI_SPLUNK_PASSWORD \
             --nodes-count $MINIKUBE_NODE_COUNTS\
           	-p no:warnings -s -n auto
+  fossa-scan:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: run fossa anlyze and create report
+        run: |
+          curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash
+          fossa analyze  --include-unused-deps --debug
+          fossa report attribution --format text > /tmp/THIRDPARTY
+        env:
+          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
+      - name: upload THIRDPARTY file
+        uses: actions/upload-artifact@v2
+        with:
+          name: THIRDPARTY
+          path: /tmp/THIRDPARTY
+      - name: run fossa test
+        run: |
+          fossa test --debug
+        env:
+          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
+  semgrep:
+    runs-on: ubuntu-latest
+    name: security-sast-semgrep
+    if: github.actor != 'dependabot[bot]'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Semgrep
+        id: semgrep
+        uses: returntocorp/semgrep-action@v1
+        with:
+          publishToken: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-k8s-metrics-agg (1.1.12)
+    fluent-plugin-k8s-metrics-agg (1.2.1)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.9.3)
       multi_json (~> 1.14.1)
@@ -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,7 +59,7 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    msgpack (1.5.1)
+    msgpack (1.6.0)
     multi_json (1.14.1)
     netrc (0.11.0)
     oj (3.10.18)
@@ -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/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

@@ -3,16 +3,16 @@ source 'https://rubygems.org'
 # This is separate gemfile for building docker image that has all plugins 
 # for kubernetes log collection agent
 # List all required gems here and install via bundler to resolve dependencies
-gem "fluentd", ">=1.14.2" 
+gem "fluentd", ">=1.15" 
 gem "fluent-plugin-prometheus", ">=2.0"
 gem "fluent-plugin-record-modifier", "=2.1.0"
-gem "fluent-plugin-kubernetes_metadata_filter", ">=2.9.2"
 gem "kubeclient", "=4.9.3"
-gem "oj", "=3.10.2"
-gem 'multi_json', '=1.14.1'
+gem "oj", "~>3.10"
+gem 'multi_json', '~>1.14'
 gem 'http_parser.rb', '=0.8.0'
 gem 'bigdecimal', '=3.0.0'
+gem 'rack', '>= 3.0.0'
 
-gem "fluent-plugin-splunk-hec", ">= 1.2.7"
+gem "fluent-plugin-splunk-hec", "= 1.3.1"
 
 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.1.12)
+    fluent-plugin-k8s-metrics-agg (1.2.1)
       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.2.4)
-      activesupport (= 7.0.2.4)
-    activesupport (7.0.2.4)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -22,37 +22,41 @@ 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)
       rake
-    fluent-plugin-kubernetes_metadata_filter (2.9.5)
-      fluentd (>= 0.14.0, < 1.15)
-      kubeclient (>= 4.0.0, < 5.0.0)
-      lru_redux
     fluent-plugin-prometheus (2.0.2)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.1.0)
       fluentd (>= 1.0, < 2)
-    fluent-plugin-splunk-hec (1.2.13)
-      fluentd (>= 1.4)
+    fluent-plugin-splunk-hec (1.3.1)
+      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.14.6)
+      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)
       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)
@@ -72,12 +76,13 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json-jwt (1.13.0)
+    json-jwt (1.15.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
+      httpclient
     jsonpath (1.1.0)
       multi_json
     kubeclient (4.9.3)
@@ -85,15 +90,14 @@ GEM
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
-    lru_redux (1.1.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    minitest (5.15.0)
-    msgpack (1.5.1)
+    minitest (5.16.3)
+    msgpack (1.6.0)
     multi_json (1.14.1)
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
@@ -111,8 +115,8 @@ GEM
       webfinger (>= 1.0.1)
     prometheus-client (4.0.0)
     public_suffix (4.0.7)
-    rack (2.2.3)
-    rack-oauth2 (1.19.0)
+    rack (3.0.1)
+    rack-oauth2 (1.21.3)
       activesupport
       attr_required
       httpclient
@@ -125,17 +129,19 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    serverengine (2.2.5)
+    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)
-    tzinfo (2.0.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    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
@@ -143,14 +149,15 @@ GEM
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
-    validate_url (1.0.13)
+    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.2)
+    yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby
@@ -158,15 +165,15 @@ PLATFORMS
 DEPENDENCIES
   bigdecimal (= 3.0.0)
   fluent-plugin-k8s-metrics-agg!
-  fluent-plugin-kubernetes_metadata_filter (>= 2.9.2)
   fluent-plugin-prometheus (>= 2.0)
   fluent-plugin-record-modifier (= 2.1.0)
-  fluent-plugin-splunk-hec (>= 1.2.7)
-  fluentd (>= 1.14.2)
+  fluent-plugin-splunk-hec (= 1.3.1)
+  fluentd (>= 1.15)
   http_parser.rb (= 0.8.0)
   kubeclient (= 4.9.3)
-  multi_json (= 1.14.1)
-  oj (= 3.10.2)
+  multi_json (~> 1.14)
+  oj (~> 3.10)
+  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
@@ -177,6 +178,10 @@ module Fluent
 
       private
 
+      def update_kubeclient_header
+        @client.headers[:Authorization] = 'Bearer ' + File.read(@bearer_token_file) if @bearer_token_file
+      end
+
       def parse_tag
         @tag_prefix, @tag_suffix = @tag.split('*') if @tag.include?('*')
       end
@@ -207,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/"
@@ -371,6 +377,7 @@ module Fluent
       end
 
       def scrape_limits_requests_metrics
+        update_kubeclient_header
         response = limits_requests_api.get(@client.headers)
         handle_limits_requests_res(response)
       rescue StandardError => e
@@ -473,6 +480,7 @@ module Fluent
       end
 
       def scrape_node_metrics
+        update_kubeclient_header
         response = node_api.get(@client.headers)
         handle_node_response(response)
       rescue StandardError => e
@@ -556,6 +564,7 @@ module Fluent
       end
 
       def scrape_resource_usage_metrics
+        update_kubeclient_header
         response = resource_usage_api.get(@client.headers)
         handle_resource_usage_response(response)
       rescue StandardError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-k8s-metrics-agg
 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
@@ -144,6 +144,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".fossa.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/enhancement_request.md"
 - ".github/ISSUE_TEMPLATE/failing_test.md"