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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70bc112ad78a8b436be2fc81cbb19333c529ace6fecfd914a6fd0322b6f1d416
-  data.tar.gz: dcdb1ecb991835130f35fea247e5f3da4a1a004f3be3d92bef6057e8e47096e2
+  metadata.gz: d80783bf51707cd2587e12afab8b264a772a15f2ac8e28357a7cfbf7db756735
+  data.tar.gz: de12ab83988f0d07a7c50f875896915fd87f824222cd8c2ae4ce05c81e1dfa1c
 SHA512:
-  metadata.gz: 97dfe412aee7d7918ad44b3962bbf06afc34dad7fa1ab242c8c34cbe2ff282356e4270ba236f3fabfe1b58047cf63c12e23282c45734363265f599e3e15a1715
-  data.tar.gz: 88bd162e3dd54b0d5dcb2a3cf02ae1d596161dae5840c1b280f3a25054d2802cb25f068a2857490395f6d87d86332f89e7caaa82023dcfcf7b5bec336166620e
+  metadata.gz: 04010cd42dc57248e834edfdcc694f6b6b85297d2f94d3a9d7f5230c4d135f3865105dd98ead308fb061e8b450bd6a350e8b2e65e060d32536c0a43f7404adf7
+  data.tar.gz: 80c89f87b2bcb000b595361d65e8f1b1dfb539c0314251aded423ed81b10c3b5ec492d7f8eb600ec18d8e3554833ecf4531cfc8a8542352701de24c5be2742c7

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,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-k8s-metrics-agg (1.1.10)
+    fluent-plugin-k8s-metrics-agg (1.2.0)
       fluentd (>= 1.9.1)
-      kubeclient (~> 4.6.0)
+      kubeclient (~> 4.9.3)
       multi_json (~> 1.14.1)
       oj (~> 3.10.2)
 
@@ -12,7 +12,7 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
@@ -23,12 +23,12 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.14.4)
+    fluentd (1.15.1)
       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.2, < 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,21 +42,24 @@ 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)
-    kubeclient (4.6.0)
+    jsonpath (1.1.2)
+      multi_json
+    kubeclient (4.9.3)
       http (>= 3.0, < 5.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    msgpack (1.4.4)
+    msgpack (1.5.4)
     multi_json (1.14.1)
     netrc (0.11.0)
     oj (3.10.18)
@@ -70,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)
@@ -81,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.2021.5)
+    tzinfo-data (1.2022.2)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    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.1)
+    yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby
@@ -107,4 +110,4 @@ DEPENDENCIES
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.3.9
+   2.3.20

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.2.0

data/docker/Dockerfile

@@ -41,7 +41,7 @@ RUN yum update -y \
    && bundle install \
    && bundle update i18n \
    && gem uninstall -i /usr/share/gems i18n --version 1.8.11 \
-   && rpm -e --nodeps python3-pip-wheel python3-urllib3-* python3-requests-* python3-libxml2-* python3-dmidecode-* subscription-manager-* libwebp-* libwebp-devel-*  glib2-* libjpeg-turbo-devel-* libjpeg-turbo-* mariadb-connector-c-config-* mariadb-connector-c-* mariadb-connector-c-devel-* rsync-* sqlite-libs-* sqlite-devel-* sqlite-* libxml2-* libxml2-devel-* libX11-* libX11-common-* libX11-devel-* libX11-xcb-* nettle-* libsolv-* file-libs-* dbus-daemon-* tar-* qt5-srpm-macros-* perl-parent-*  git-* bsdtar-* openssh-clients-* json-c-* binutils-* libtiff-devel-* libtiff-* || true
+   && rpm -e --nodeps python3-pip-wheel python3-urllib3-* python3-requests-* python3-libxml2-* python3-dmidecode-* subscription-manager-* libwebp-* libwebp-devel-* libjpeg-turbo-devel-* libjpeg-turbo-* mariadb-connector-c-config-* mariadb-connector-c-* mariadb-connector-c-devel-* rsync-* libX11-* libX11-common-* libX11-devel-* libX11-xcb-*  dbus-daemon-* tar-* qt5-srpm-macros-* perl-parent-*  git-* bsdtar-* openssh-clients-* binutils-* libtiff-devel-* libtiff-* || true
 
 RUN groupadd -r $FLUENT_USER && \
   useradd -r -g $FLUENT_USER $FLUENT_USER && \

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.6.0"
-gem "oj", "=3.10.2"
-gem 'multi_json', '=1.14.1'
-gem 'http_parser.rb', '=0.5.3'
+gem "kubeclient", "=4.9.3"
+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 "fluent-plugin-splunk-hec", ">= 1.2.7"
+gem "fluent-plugin-splunk-hec", "= 1.3.0"
 
 gem 'fluent-plugin-k8s-metrics-agg', path: 'gem/'

data/docker/Gemfile.lock

@@ -1,59 +1,54 @@
 PATH
   remote: gem
   specs:
-    fluent-plugin-k8s-metrics-agg (1.1.10)
+    fluent-plugin-k8s-metrics-agg (1.2.0)
       fluentd (>= 1.9.1)
-      kubeclient (~> 4.6.0)
+      kubeclient (~> 4.9.3)
       multi_json (~> 1.14.1)
       oj (~> 3.10.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.3)
-      activesupport (= 6.1.4.3)
-    activesupport (6.1.4.3)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     attr_required (1.0.1)
     bigdecimal (3.0.0)
     bindata (2.4.10)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     cool.io (1.7.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluent-plugin-kubernetes_metadata_filter (2.9.3)
-      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.11)
-      fluentd (>= 1.4)
+    fluent-plugin-splunk-hec (1.3.0)
+      fluentd (>= 1.5)
       multi_json (~> 1.13)
-      net-http-persistent (~> 3.1)
+      net-http-persistent (~> 4.0)
       openid_connect (~> 1.1.8)
       prometheus-client (>= 2.1.0)
-    fluentd (1.14.3)
+    fluentd (1.15.1)
       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.2, < 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)
@@ -71,29 +66,32 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
-    http_parser.rb (0.5.3)
+    http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json-jwt (1.13.0)
+    json-jwt (1.15.2)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
-    kubeclient (4.6.0)
+      httpclient
+    jsonpath (1.1.0)
+      multi_json
+    kubeclient (4.9.3)
       http (>= 3.0, < 5.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
+      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.2021.1115)
+    mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    minitest (5.15.0)
-    msgpack (1.4.2)
+    minitest (5.16.2)
+    msgpack (1.5.4)
     multi_json (1.14.1)
-    net-http-persistent (3.1.0)
+    net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
     netrc (0.11.0)
     oj (3.10.2)
@@ -107,10 +105,10 @@ GEM
       validate_email
       validate_url
       webfinger (>= 1.0.1)
-    prometheus-client (2.1.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-oauth2 (1.19.0)
+    prometheus-client (4.0.0)
+    public_suffix (4.0.7)
+    rack (2.2.3.1)
+    rack-oauth2 (1.21.2)
       activesupport
       attr_required
       httpclient
@@ -123,7 +121,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    serverengine (2.2.4)
+    serverengine (2.3.0)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.5)
@@ -131,25 +129,24 @@ GEM
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.2)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     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)
       activesupport
       httpclient (>= 2.4)
     webrick (1.7.0)
-    yajl-ruby (1.4.1)
-    zeitwerk (2.5.1)
+    yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby
@@ -157,15 +154,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)
-  http_parser.rb (= 0.5.3)
-  kubeclient (= 4.6.0)
-  multi_json (= 1.14.1)
-  oj (= 3.10.2)
+  fluent-plugin-splunk-hec (= 1.3.0)
+  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)
 
 BUNDLED WITH
    2.1.4

data/fluent-plugin-k8s-metrics-agg.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", '~> 0.16.1'
   spec.add_development_dependency 'webmock', '~> 3.5.1'
   spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
-  spec.add_runtime_dependency 'kubeclient', '~> 4.6.0'
+  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'
 

data/lib/fluent/plugin/in_kubernetes_metrics_aggregator.rb

@@ -177,6 +177,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
@@ -371,6 +375,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 +478,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 +562,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.10
+  version: 1.2.0
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.9.3
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -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"