chore(deps): update all dependencies

kube-logging · Sep 27, 2024 · ed8d864 · ed8d864
1 parent b2810d4
commit ed8d864
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 56 deletions.
diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
@@ -73,7 +73,7 @@ jobs:
           target: ${{ matrix.image-type }}
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.23.0
+        uses: aquasecurity/trivy-action@0.24.0
         with:
           image-ref: "ghcr.io/${{ github.repository_owner }}/fluentd:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}"
           format: "sarif"

diff --git a/v1.16-4.10/Dockerfile b/v1.16-4.10/Dockerfile
@@ -2,7 +2,7 @@
 # https://gallery.ecr.aws/sumologic/kubernetes-fluentd
 FROM public.ecr.aws/sumologic/kubernetes-fluentd:1.16.5-sumo-0-alpine as sumo
 
-FROM ruby:3.2.5-alpine3.20 as base
+FROM ruby:3.3.5-alpine3.20 as base
 
 ARG BUILD_DEPS=" \
       make gcc g++ libc-dev \

diff --git a/v1.16-4.10/outputs/Gemfile b/v1.16-4.10/outputs/Gemfile
@@ -20,6 +20,6 @@ gem 'fluent-plugin-webhdfs', '1.6.0'
 gem 'fluent-plugin-vmware-loginsight', '1.4.2'
 gem 'fluent-plugin-vmware-log-intelligence', '2.0.8'
 gem 'fluent-plugin-gelf-best', '1.3.4'
-gem 'rdkafka', '0.16.0'
+gem 'rdkafka', '0.18.0'
 #gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1'
 #gem 'fluent-plugin-logdna', '~> 0.4.0'
diff --git a/v1.16-4.10/outputs/Gemfile.lock b/v1.16-4.10/outputs/Gemfile.lock
@@ -75,7 +75,7 @@ GEM
     faraday_middleware-aws-sigv4 (1.0.1)
       aws-sigv4 (~> 1.0)
       faraday (>= 2.0, < 3)
-    ffi (1.16.3)
+    ffi (1.17.0)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -107,8 +107,8 @@ GEM
       ltsv
       ruby-kafka (>= 1.5.0, < 2)
     fluent-plugin-kinesis (3.5.0)
-      aws-sdk-firehose (~> 1, != 1.5, != 1.9, != 1.15)
-      aws-sdk-kinesis (~> 1, != 1.4, != 1.5, != 1.14)
+      aws-sdk-firehose (~> 1, != 1.9, != 1.5, != 1.15)
+      aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14)
       fluentd (>= 0.14.22, < 2)
       google-protobuf (~> 3)
     fluent-plugin-logzio (0.2.2)
@@ -254,8 +254,8 @@ GEM
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rake (13.0.6)
-    rdkafka (0.16.0)
+    rake (13.2.1)
+    rdkafka (0.18.0)
       ffi (~> 1.15)
       mini_portile2 (~> 2.6)
       rake (> 12)
@@ -326,4 +326,7 @@ DEPENDENCIES
   fluent-plugin-vmware-log-intelligence (= 2.0.8)
   fluent-plugin-vmware-loginsight (= 1.4.2)
   fluent-plugin-webhdfs (= 1.6.0)
-  rdkafka (= 0.16.0)
+  rdkafka (= 0.18.0)
+
+BUNDLED WITH
+   2.5.20
diff --git a/v1.16-4.8/Dockerfile b/v1.16-4.8/Dockerfile
@@ -2,7 +2,7 @@
 # https://gallery.ecr.aws/sumologic/kubernetes-fluentd
 FROM public.ecr.aws/sumologic/kubernetes-fluentd:1.16.5-sumo-0-alpine as sumo
 
-FROM ruby:3.2.4-alpine3.18 as base
+FROM ruby:3.3.1-alpine3.18 as base
 
 ARG BUILD_DEPS=" \
       make gcc g++ libc-dev \

diff --git a/v1.16-4.8/filters/Gemfile b/v1.16-4.8/filters/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'fluent-plugin-detect-exceptions', '0.0.15'
-gem 'fluent-plugin-prometheus', '2.1.0'
+gem 'fluent-plugin-prometheus', '2.2.0'
 gem 'fluent-plugin-dedot_filter', '1.0.0'
 gem 'fluent-plugin-geoip', '1.3.2'
 gem 'fluent-plugin-tag-normaliser', '0.1.3'

diff --git a/v1.16-4.8/filters/Gemfile.lock b/v1.16-4.8/filters/Gemfile.lock
@@ -1,9 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.2.3)
-    cool.io (1.8.0)
+    base64 (0.2.0)
+    concurrent-ruby (1.3.4)
+    cool.io (1.8.1)
+    csv (3.3.0)
     dig_rb (1.0.1)
+    drb (2.2.1)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.5.0)
@@ -29,7 +32,7 @@ GEM
     fluent-plugin-parser-logfmt (0.0.0)
       fluentd (>= 1, < 2)
       logfmt (~> 0.0.8)
-    fluent-plugin-prometheus (2.1.0)
+    fluent-plugin-prometheus (2.2.0)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.2.0)
@@ -45,10 +48,14 @@ GEM
       fluentd (>= 0.14, < 2)
       lru_redux (>= 1.0.0)
       user_agent_parser (>= 2.2.0)
-    fluentd (1.16.3)
+    fluentd (1.17.1)
+      base64 (~> 0.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
+      csv (~> 3.2)
+      drb (~> 2.2)
       http_parser.rb (>= 0.5.1, < 0.9.0)
+      logger (~> 1.6)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.3.2, < 3.0.0)
       sigdump (~> 0.2.5)
@@ -61,17 +68,19 @@ GEM
     geoip2_c (0.3.4)
     http_parser.rb (0.8.0)
     logfmt (0.0.10)
+    logger (1.6.1)
     lru_redux (1.1.0)
     msgpack (1.7.2)
     myslog (0.1.1)
-    prometheus-client (4.2.1)
+    prometheus-client (4.2.3)
+      base64
     serverengine (2.3.2)
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     user_agent_parser (2.16.0)
     webrick (1.8.2)
@@ -90,7 +99,7 @@ DEPENDENCIES
   fluent-plugin-multi-format-parser (= 1.1.0)
   fluent-plugin-mysqlslowquery (= 0.0.9)
   fluent-plugin-parser-logfmt (= 0.0.0)
-  fluent-plugin-prometheus (= 2.1.0)
+  fluent-plugin-prometheus (= 2.2.0)
   fluent-plugin-record-modifier (= 2.2.0)
   fluent-plugin-rewrite-tag-filter (= 2.4.0)
   fluent-plugin-tag-normaliser (= 0.1.3)

diff --git a/v1.16-4.8/outputs/Gemfile b/v1.16-4.8/outputs/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'fluent-plugin-aliyun-oss', '0.0.1'
 gem 'fluent-plugin-sumologic_output', '1.9.0'
-gem 'fluent-plugin-kafka', '0.19.2'
+gem 'fluent-plugin-kafka', '0.19.3'
 gem 'fluent-plugin-grafana-loki', '1.2.20'
 gem 'fluent-plugin-kinesis', '3.5.0'
 gem 'fluent-plugin-splunk-hec', '1.3.3'
@@ -11,14 +11,14 @@ gem 'fluent-plugin-newrelic', '1.2.3'
 gem 'fluent-plugin-cloudwatch-logs', '0.14.3'
 gem 'fluent-plugin-opensearch', '1.1.4'
 gem 'fluent-plugin-logzio', '0.2.2'
-gem 'fluent-plugin-datadog', '0.14.3'
+gem 'fluent-plugin-datadog', '0.14.4'
 gem 'fluent-plugin-redis', '0.3.5'
 gem 'fluent-plugin-sqs', '3.0.0'
 gem 'fluent-plugin-mattermost', '0.2.2'
 gem 'fluent-plugin-remote-syslog', '1.1.0'
 gem 'fluent-plugin-webhdfs', '1.6.0'
 gem 'fluent-plugin-vmware-loginsight', '1.4.2'
 gem 'fluent-plugin-vmware-log-intelligence', '2.0.8'
-gem 'fluent-plugin-gelf-best', '1.3.3'
+gem 'fluent-plugin-gelf-best', '1.3.4'
 #gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1'
 #gem 'fluent-plugin-logdna', '~> 0.4.0'
diff --git a/v1.16-4.8/outputs/Gemfile.lock b/v1.16-4.8/outputs/Gemfile.lock
@@ -46,7 +46,11 @@ GEM
     bindata (2.5.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    cool.io (1.8.0)
+    console (1.23.7)
+      fiber-annotation
+      fiber-local
+      json
+    cool.io (1.8.1)
     date (3.3.3)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
@@ -79,6 +83,10 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.0)
     fluent-mixin-config-placeholders (0.4.0)
       fluentd
       uuidtools (>= 2.1.5)
@@ -88,7 +96,7 @@ GEM
     fluent-plugin-cloudwatch-logs (0.14.3)
       aws-sdk-cloudwatchlogs (~> 1.0)
       fluentd (>= 1.8.0)
-    fluent-plugin-datadog (0.14.3)
+    fluent-plugin-datadog (0.14.4)
       fluentd (>= 1, < 2)
       net-http-persistent (~> 4.0.1)
     fluent-plugin-elasticsearch (5.4.3)
@@ -97,12 +105,12 @@ GEM
       faraday (>= 2.0.0)
       faraday-excon (>= 2.0.0)
       fluentd (>= 0.14.22)
-    fluent-plugin-gelf-best (1.3.3)
+    fluent-plugin-gelf-best (1.3.4)
       fluentd (>= 1.0.0)
-      gelf (>= 2.0.0)
+      gelf (>= 3.1.0)
     fluent-plugin-grafana-loki (1.2.20)
       fluentd (>= 1.9.3, < 2)
-    fluent-plugin-kafka (0.19.2)
+    fluent-plugin-kafka (0.19.3)
       fluentd (>= 0.10.58, < 2)
       ltsv
       ruby-kafka (>= 1.5.0, < 2)
@@ -162,8 +170,9 @@ GEM
     fluent-plugin-webhdfs (1.6.0)
       fluentd (>= 0.14.22)
       webhdfs (>= 0.11.0)
-    fluentd (1.16.3)
+    fluentd (1.16.6)
       bundler
+      console (< 1.24)
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
@@ -216,7 +225,7 @@ GEM
     multi_json (1.15.0)
     mutex_m (0.2.0)
     myslog (0.1.1)
-    net-http-persistent (4.0.2)
+    net-http-persistent (4.0.4)
       connection_pool (~> 2.2)
     net-imap (0.4.2)
       date
@@ -277,7 +286,7 @@ GEM
     timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.1)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -304,11 +313,11 @@ PLATFORMS
 DEPENDENCIES
   fluent-plugin-aliyun-oss (= 0.0.1)
   fluent-plugin-cloudwatch-logs (= 0.14.3)
-  fluent-plugin-datadog (= 0.14.3)
+  fluent-plugin-datadog (= 0.14.4)
   fluent-plugin-elasticsearch (= 5.4.3)
-  fluent-plugin-gelf-best (= 1.3.3)
+  fluent-plugin-gelf-best (= 1.3.4)
   fluent-plugin-grafana-loki (= 1.2.20)
-  fluent-plugin-kafka (= 0.19.2)
+  fluent-plugin-kafka (= 0.19.3)
   fluent-plugin-kinesis (= 3.5.0)
   fluent-plugin-logzio (= 0.2.2)
   fluent-plugin-mattermost (= 0.2.2)

diff --git a/v1.16-4.9/Dockerfile b/v1.16-4.9/Dockerfile
@@ -2,7 +2,7 @@
 # https://gallery.ecr.aws/sumologic/kubernetes-fluentd
 FROM public.ecr.aws/sumologic/kubernetes-fluentd:1.16.5-sumo-0-alpine as sumo
 
-FROM ruby:3.2.4-alpine3.18 as base
+FROM ruby:3.3.1-alpine3.18 as base
 
 ARG BUILD_DEPS=" \
       make gcc g++ libc-dev \

diff --git a/v1.16-4.9/filters/Gemfile b/v1.16-4.9/filters/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'fluent-plugin-detect-exceptions', '0.0.15'
-gem 'fluent-plugin-prometheus', '2.1.0'
+gem 'fluent-plugin-prometheus', '2.2.0'
 gem 'fluent-plugin-dedot_filter', '1.0.0'
 gem 'fluent-plugin-geoip', '1.3.2'
 gem 'fluent-plugin-tag-normaliser', '0.1.3'

diff --git a/v1.16-4.9/filters/Gemfile.lock b/v1.16-4.9/filters/Gemfile.lock
@@ -1,9 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.2.3)
-    cool.io (1.8.0)
+    base64 (0.2.0)
+    concurrent-ruby (1.3.4)
+    cool.io (1.8.1)
+    csv (3.3.0)
     dig_rb (1.0.1)
+    drb (2.2.1)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.5.0)
@@ -29,7 +32,7 @@ GEM
     fluent-plugin-parser-logfmt (0.0.0)
       fluentd (>= 1, < 2)
       logfmt (~> 0.0.8)
-    fluent-plugin-prometheus (2.1.0)
+    fluent-plugin-prometheus (2.2.0)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.2.0)
@@ -45,10 +48,14 @@ GEM
       fluentd (>= 0.14, < 2)
       lru_redux (>= 1.0.0)
       user_agent_parser (>= 2.2.0)
-    fluentd (1.16.3)
+    fluentd (1.17.1)
+      base64 (~> 0.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
+      csv (~> 3.2)
+      drb (~> 2.2)
       http_parser.rb (>= 0.5.1, < 0.9.0)
+      logger (~> 1.6)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.3.2, < 3.0.0)
       sigdump (~> 0.2.5)
@@ -61,17 +68,19 @@ GEM
     geoip2_c (0.3.4)
     http_parser.rb (0.8.0)
     logfmt (0.0.10)
+    logger (1.6.1)
     lru_redux (1.1.0)
     msgpack (1.7.2)
     myslog (0.1.1)
-    prometheus-client (4.2.1)
+    prometheus-client (4.2.3)
+      base64
     serverengine (2.3.2)
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     user_agent_parser (2.16.0)
     webrick (1.8.2)
@@ -90,7 +99,7 @@ DEPENDENCIES
   fluent-plugin-multi-format-parser (= 1.1.0)
   fluent-plugin-mysqlslowquery (= 0.0.9)
   fluent-plugin-parser-logfmt (= 0.0.0)
-  fluent-plugin-prometheus (= 2.1.0)
+  fluent-plugin-prometheus (= 2.2.0)
   fluent-plugin-record-modifier (= 2.2.0)
   fluent-plugin-rewrite-tag-filter (= 2.4.0)
   fluent-plugin-tag-normaliser (= 0.1.3)

diff --git a/v1.16-4.9/outputs/Gemfile b/v1.16-4.9/outputs/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'fluent-plugin-aliyun-oss', '0.0.1'
 gem 'fluent-plugin-sumologic_output', '1.9.0'
-gem 'fluent-plugin-kafka', '0.19.2'
+gem 'fluent-plugin-kafka', '0.19.3'
 gem 'fluent-plugin-grafana-loki', '1.2.20'
 gem 'fluent-plugin-kinesis', '3.5.0'
 gem 'fluent-plugin-splunk-hec', '1.3.3'
@@ -11,15 +11,15 @@ gem 'fluent-plugin-newrelic', '1.2.3'
 gem 'fluent-plugin-cloudwatch-logs', '0.14.3'
 gem 'fluent-plugin-opensearch', '1.1.4'
 gem 'fluent-plugin-logzio', '0.2.2'
-gem 'fluent-plugin-datadog', '0.14.3'
+gem 'fluent-plugin-datadog', '0.14.4'
 gem 'fluent-plugin-redis', '0.3.5'
 gem 'fluent-plugin-sqs', '3.0.0'
 gem 'fluent-plugin-mattermost', '0.2.2'
 gem 'fluent-plugin-remote-syslog', '1.1.0'
 gem 'fluent-plugin-webhdfs', '1.6.0'
 gem 'fluent-plugin-vmware-loginsight', '1.4.2'
 gem 'fluent-plugin-vmware-log-intelligence', '2.0.8'
-gem 'fluent-plugin-gelf-best', '1.3.3'
-gem 'rdkafka', '0.16.0'
+gem 'fluent-plugin-gelf-best', '1.3.4'
+gem 'rdkafka', '0.18.0'
 #gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1'
 #gem 'fluent-plugin-logdna', '~> 0.4.0'