From c2d29baa7de75faa77e0b966550d2bd0e5c98cee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:40:51 +0000 Subject: [PATCH 1/3] chore(deps): update all dependencies --- .github/workflows/artifacts.yaml | 2 +- v1.16-ruby3.3/Dockerfile | 4 ++-- v1.16-ruby3.3/outputs/Gemfile | 6 +++--- v1.16-ruby3.3/outputs/Gemfile.lock | 19 +++++++++++-------- v1.16/Dockerfile | 4 ++-- v1.16/outputs/Gemfile | 6 +++--- v1.16/outputs/Gemfile.lock | 19 +++++++++++-------- 7 files changed, 33 insertions(+), 27 deletions(-) diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml index 4347007d..32aeff75 100644 --- a/.github/workflows/artifacts.yaml +++ b/.github/workflows/artifacts.yaml @@ -72,7 +72,7 @@ jobs: target: ${{ matrix.image-type }} - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.18.0 + uses: aquasecurity/trivy-action@0.22.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-ruby3.3/Dockerfile b/v1.16-ruby3.3/Dockerfile index 951dce09..b9abb48f 100644 --- a/v1.16-ruby3.3/Dockerfile +++ b/v1.16-ruby3.3/Dockerfile @@ -1,8 +1,8 @@ # https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/main/alpine.Dockerfile # TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file) -FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo +FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:683d1d89027abfc453653e25ca3828a8c73e660a06fcea74fe37833a5c321dee AS sumo -FROM ruby:3.3.0-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-ruby3.3/outputs/Gemfile b/v1.16-ruby3.3/outputs/Gemfile index 2a79ac4f..b7c652b5 100644 --- a/v1.16-ruby3.3/outputs/Gemfile +++ b/v1.16-ruby3.3/outputs/Gemfile @@ -7,16 +7,16 @@ gem 'fluent-plugin-grafana-loki', '1.2.20' gem 'fluent-plugin-kinesis', '3.5.0' gem 'fluent-plugin-splunk-hec', '1.3.3' gem 'fluent-plugin-elasticsearch', '5.4.3' -gem 'fluent-plugin-newrelic', '1.2.2' +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.2' +gem 'fluent-plugin-datadog', '0.14.3' 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.5.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' diff --git a/v1.16-ruby3.3/outputs/Gemfile.lock b/v1.16-ruby3.3/outputs/Gemfile.lock index 4a13b273..460522c2 100644 --- a/v1.16-ruby3.3/outputs/Gemfile.lock +++ b/v1.16-ruby3.3/outputs/Gemfile.lock @@ -88,7 +88,7 @@ GEM fluent-plugin-cloudwatch-logs (0.14.3) aws-sdk-cloudwatchlogs (~> 1.0) fluentd (>= 1.8.0) - fluent-plugin-datadog (0.14.2) + fluent-plugin-datadog (0.14.3) fluentd (>= 1, < 2) net-http-persistent (~> 4.0.1) fluent-plugin-elasticsearch (5.4.3) @@ -120,7 +120,7 @@ GEM fluent-plugin-mysqlslowquery (0.0.9) fluentd (>= 0.12.0, < 2) myslog (~> 0.0) - fluent-plugin-newrelic (1.2.2) + fluent-plugin-newrelic (1.2.3) fluentd (>= 1.0.0) fluent-plugin-opensearch (1.1.4) aws-sdk-core (~> 3) @@ -159,9 +159,9 @@ GEM myslog (~> 0.0) fluent-plugin-vmware-loginsight (1.4.2) fluentd (>= 0.14.10, < 2) - fluent-plugin-webhdfs (1.5.0) + fluent-plugin-webhdfs (1.6.0) fluentd (>= 0.14.22) - webhdfs (>= 0.10.0) + webhdfs (>= 0.11.0) fluentd (1.16.3) bundler cool.io (>= 1.4.5, < 2.0.0) @@ -293,7 +293,7 @@ GEM activesupport faraday (~> 2.0) faraday-follow_redirects - webhdfs (0.10.2) + webhdfs (0.11.0) addressable webrick (1.8.1) yajl-ruby (1.4.3) @@ -304,7 +304,7 @@ PLATFORMS DEPENDENCIES fluent-plugin-aliyun-oss (= 0.0.1) fluent-plugin-cloudwatch-logs (= 0.14.3) - fluent-plugin-datadog (= 0.14.2) + fluent-plugin-datadog (= 0.14.3) fluent-plugin-elasticsearch (= 5.4.3) fluent-plugin-gelf-best (= 1.3.3) fluent-plugin-grafana-loki (= 1.2.20) @@ -312,7 +312,7 @@ DEPENDENCIES fluent-plugin-kinesis (= 3.5.0) fluent-plugin-logzio (= 0.2.2) fluent-plugin-mattermost (= 0.2.2) - fluent-plugin-newrelic (= 1.2.2) + fluent-plugin-newrelic (= 1.2.3) fluent-plugin-opensearch (= 1.1.4) fluent-plugin-redis (= 0.3.5) fluent-plugin-remote-syslog (= 1.1.0) @@ -321,4 +321,7 @@ DEPENDENCIES fluent-plugin-sumologic_output (= 1.9.0) fluent-plugin-vmware-log-intelligence (= 2.0.8) fluent-plugin-vmware-loginsight (= 1.4.2) - fluent-plugin-webhdfs (= 1.5.0) + fluent-plugin-webhdfs (= 1.6.0) + +BUNDLED WITH + 2.5.11 diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile index f4667115..86f778a3 100644 --- a/v1.16/Dockerfile +++ b/v1.16/Dockerfile @@ -1,7 +1,7 @@ # TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file) -FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo +FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:683d1d89027abfc453653e25ca3828a8c73e660a06fcea74fe37833a5c321dee 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/outputs/Gemfile b/v1.16/outputs/Gemfile index 2a79ac4f..b7c652b5 100644 --- a/v1.16/outputs/Gemfile +++ b/v1.16/outputs/Gemfile @@ -7,16 +7,16 @@ gem 'fluent-plugin-grafana-loki', '1.2.20' gem 'fluent-plugin-kinesis', '3.5.0' gem 'fluent-plugin-splunk-hec', '1.3.3' gem 'fluent-plugin-elasticsearch', '5.4.3' -gem 'fluent-plugin-newrelic', '1.2.2' +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.2' +gem 'fluent-plugin-datadog', '0.14.3' 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.5.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' diff --git a/v1.16/outputs/Gemfile.lock b/v1.16/outputs/Gemfile.lock index 4a13b273..460522c2 100644 --- a/v1.16/outputs/Gemfile.lock +++ b/v1.16/outputs/Gemfile.lock @@ -88,7 +88,7 @@ GEM fluent-plugin-cloudwatch-logs (0.14.3) aws-sdk-cloudwatchlogs (~> 1.0) fluentd (>= 1.8.0) - fluent-plugin-datadog (0.14.2) + fluent-plugin-datadog (0.14.3) fluentd (>= 1, < 2) net-http-persistent (~> 4.0.1) fluent-plugin-elasticsearch (5.4.3) @@ -120,7 +120,7 @@ GEM fluent-plugin-mysqlslowquery (0.0.9) fluentd (>= 0.12.0, < 2) myslog (~> 0.0) - fluent-plugin-newrelic (1.2.2) + fluent-plugin-newrelic (1.2.3) fluentd (>= 1.0.0) fluent-plugin-opensearch (1.1.4) aws-sdk-core (~> 3) @@ -159,9 +159,9 @@ GEM myslog (~> 0.0) fluent-plugin-vmware-loginsight (1.4.2) fluentd (>= 0.14.10, < 2) - fluent-plugin-webhdfs (1.5.0) + fluent-plugin-webhdfs (1.6.0) fluentd (>= 0.14.22) - webhdfs (>= 0.10.0) + webhdfs (>= 0.11.0) fluentd (1.16.3) bundler cool.io (>= 1.4.5, < 2.0.0) @@ -293,7 +293,7 @@ GEM activesupport faraday (~> 2.0) faraday-follow_redirects - webhdfs (0.10.2) + webhdfs (0.11.0) addressable webrick (1.8.1) yajl-ruby (1.4.3) @@ -304,7 +304,7 @@ PLATFORMS DEPENDENCIES fluent-plugin-aliyun-oss (= 0.0.1) fluent-plugin-cloudwatch-logs (= 0.14.3) - fluent-plugin-datadog (= 0.14.2) + fluent-plugin-datadog (= 0.14.3) fluent-plugin-elasticsearch (= 5.4.3) fluent-plugin-gelf-best (= 1.3.3) fluent-plugin-grafana-loki (= 1.2.20) @@ -312,7 +312,7 @@ DEPENDENCIES fluent-plugin-kinesis (= 3.5.0) fluent-plugin-logzio (= 0.2.2) fluent-plugin-mattermost (= 0.2.2) - fluent-plugin-newrelic (= 1.2.2) + fluent-plugin-newrelic (= 1.2.3) fluent-plugin-opensearch (= 1.1.4) fluent-plugin-redis (= 0.3.5) fluent-plugin-remote-syslog (= 1.1.0) @@ -321,4 +321,7 @@ DEPENDENCIES fluent-plugin-sumologic_output (= 1.9.0) fluent-plugin-vmware-log-intelligence (= 2.0.8) fluent-plugin-vmware-loginsight (= 1.4.2) - fluent-plugin-webhdfs (= 1.5.0) + fluent-plugin-webhdfs (= 1.6.0) + +BUNDLED WITH + 2.5.11 From 7657457b700e7387d1662ea6a643178856605805 Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Wed, 12 Jun 2024 20:42:19 +0200 Subject: [PATCH 2/3] Keep ruby version Signed-off-by: Peter Wilcsinszky --- v1.16/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile index 86f778a3..290b5438 100644 --- a/v1.16/Dockerfile +++ b/v1.16/Dockerfile @@ -1,7 +1,7 @@ # TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file) FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:683d1d89027abfc453653e25ca3828a8c73e660a06fcea74fe37833a5c321dee AS sumo -FROM ruby:3.3.1-alpine3.18 as base +FROM ruby:3.2.4-alpine3.18 as base ARG BUILD_DEPS=" \ make gcc g++ libc-dev \ From 3eb6a73d2f99b311dc9bc120f6bcac647c46ac3b Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Wed, 12 Jun 2024 20:43:06 +0200 Subject: [PATCH 3/3] Keep base image Signed-off-by: Peter Wilcsinszky --- v1.16/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile index 290b5438..f4667115 100644 --- a/v1.16/Dockerfile +++ b/v1.16/Dockerfile @@ -1,5 +1,5 @@ # TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file) -FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:683d1d89027abfc453653e25ca3828a8c73e660a06fcea74fe37833a5c321dee AS sumo +FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo FROM ruby:3.2.4-alpine3.18 as base