From 0bb90598cc7b232f0071a20c0d8c8b4d3b707220 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 00:20:48 +0000 Subject: [PATCH 1/3] chore(deps): update dependency fluentd to v1.17.0 --- logs-concentrator/Gemfile | 2 +- logs-concentrator/Gemfile.lock | 12 +++++++++--- logs-dispatcher/Gemfile | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/logs-concentrator/Gemfile b/logs-concentrator/Gemfile index 8b4282d8..618781c8 100644 --- a/logs-concentrator/Gemfile +++ b/logs-concentrator/Gemfile @@ -7,4 +7,4 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } gem "fluent-plugin-elasticsearch", "5.4.3" gem "fluent-plugin-opensearch", "1.1.4" gem "fluent-plugin-prometheus", "2.1.0" -gem "fluentd", "1.16.5" +gem "fluentd", "1.17.0" diff --git a/logs-concentrator/Gemfile.lock b/logs-concentrator/Gemfile.lock index 30fdfeaa..2bd0b765 100644 --- a/logs-concentrator/Gemfile.lock +++ b/logs-concentrator/Gemfile.lock @@ -10,8 +10,11 @@ GEM jmespath (~> 1, >= 1.6.1) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) + base64 (0.2.0) concurrent-ruby (1.2.3) - cool.io (1.8.0) + cool.io (1.8.1) + csv (3.3.0) + drb (2.2.1) elastic-transport (8.3.2) faraday (< 3) multi_json @@ -48,9 +51,12 @@ GEM fluent-plugin-prometheus (2.1.0) fluentd (>= 1.9.1, < 2) prometheus-client (>= 2.1.0) - fluentd (1.16.5) + fluentd (1.17.0) + 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) msgpack (>= 1.3.1, < 2.0.0) serverengine (>= 2.3.2, < 3.0.0) @@ -90,7 +96,7 @@ DEPENDENCIES fluent-plugin-elasticsearch (= 5.4.3) fluent-plugin-opensearch (= 1.1.4) fluent-plugin-prometheus (= 2.1.0) - fluentd (= 1.16.5) + fluentd (= 1.17.0) BUNDLED WITH 2.5.7 diff --git a/logs-dispatcher/Gemfile b/logs-dispatcher/Gemfile index b271f160..aa2372ed 100644 --- a/logs-dispatcher/Gemfile +++ b/logs-dispatcher/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-route", "1.0.0" gem "fluent-plugin-s3", "1.7.2" gem "fluent-plugin-splunk-enterprise", "0.10.2" gem "fluent-plugin-sumologic_output", "1.9.0" -gem "fluentd", "1.16.5" +gem "fluentd", "1.17.0" From 11468827ed9a3e882c07cb54cc022cdd96affec7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 00:20:51 +0000 Subject: [PATCH 2/3] chore(deps): update fluent/fluentd docker tag to v1.17.0 --- logs-concentrator/Dockerfile | 2 +- logs-dispatcher/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/logs-concentrator/Dockerfile b/logs-concentrator/Dockerfile index 786778f3..17a24982 100644 --- a/logs-concentrator/Dockerfile +++ b/logs-concentrator/Dockerfile @@ -1,4 +1,4 @@ -FROM fluent/fluentd:v1.16.5-1.0 +FROM fluent/fluentd:v1.17.0-1.0 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-service-images" repository="https://github.com/uselagoon/lagoon-service-images" diff --git a/logs-dispatcher/Dockerfile b/logs-dispatcher/Dockerfile index 27e8c692..c8323e01 100644 --- a/logs-dispatcher/Dockerfile +++ b/logs-dispatcher/Dockerfile @@ -1,4 +1,4 @@ -FROM fluent/fluentd:v1.16.5-1.0 +FROM fluent/fluentd:v1.17.0-1.0 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-service-images" repository="https://github.com/uselagoon/lagoon-service-images" From 74f7d4455a3006e50797c017b34cb155b019757a Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 21 May 2024 11:04:29 +1000 Subject: [PATCH 3/3] chore: update for fluentd 1.17.0 --- logs-concentrator/Gemfile.lock | 4 ++-- logs-concentrator/Makefile | 2 +- logs-dispatcher/Makefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logs-concentrator/Gemfile.lock b/logs-concentrator/Gemfile.lock index 2bd0b765..727155f7 100644 --- a/logs-concentrator/Gemfile.lock +++ b/logs-concentrator/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: aws-eventstream (1.3.0) - aws-partitions (1.930.0) + aws-partitions (1.931.0) aws-sdk-core (3.196.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -99,4 +99,4 @@ DEPENDENCIES fluentd (= 1.17.0) BUNDLED WITH - 2.5.7 + 2.5.10 diff --git a/logs-concentrator/Makefile b/logs-concentrator/Makefile index 256770f4..8a794e38 100644 --- a/logs-concentrator/Makefile +++ b/logs-concentrator/Makefile @@ -10,5 +10,5 @@ update-gemfile: -v $$PWD/Gemfile.lock:/tmp/Gemfile.lock \ -w /tmp \ --entrypoint bundle \ - fluent/fluentd:v1.16.5-1.0 \ + fluent/fluentd:v1.17.0-1.0 \ lock --update diff --git a/logs-dispatcher/Makefile b/logs-dispatcher/Makefile index 482a66c0..09449827 100644 --- a/logs-dispatcher/Makefile +++ b/logs-dispatcher/Makefile @@ -11,7 +11,7 @@ update-gemfile: -v $$PWD/Gemfile.lock:/tmp/Gemfile.lock \ -w /tmp \ --entrypoint bundle \ - fluent/fluentd:v1.16.5-1.0 \ + fluent/fluentd:v1.17.0-1.0 \ lock --update .PHONY: update-vendor-cache @@ -24,5 +24,5 @@ update-vendor-cache: -w /tmp \ -e BUNDLE_NO_INSTALL=true \ --entrypoint bundle \ - fluent/fluentd:v1.16.5-1.0 \ + fluent/fluentd:v1.17.0-1.0 \ cache