Merge pull request #86 from uselagoon/fluentd17

update logs-dispatcher and logs-concentrator to fluentd17
uselagoon · Nov 7, 2024 · 8ab5056 · 8ab5056
2 parents 6ca4e4d + 834babc
commit 8ab5056
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 59 deletions.
diff --git 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.1-1.1
 
 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-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.5"
 gem "fluent-plugin-prometheus", "2.2.0"
-gem "fluentd", "1.16.5"
+gem "fluentd", "1.17.1"
diff --git a/logs-concentrator/Gemfile.lock b/logs-concentrator/Gemfile.lock
@@ -2,32 +2,36 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.3.0)
-    aws-partitions (1.930.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.1001.0)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     concurrent-ruby (1.3.4)
-    cool.io (1.8.1)
-    elastic-transport (8.3.2)
+    cool.io (1.9.0)
+    csv (3.3.0)
+    drb (2.2.1)
+    elastic-transport (8.3.5)
       faraday (< 3)
       multi_json
-    elasticsearch (8.13.0)
+    elasticsearch (8.15.0)
       elastic-transport (~> 8.3)
-      elasticsearch-api (= 8.13.0)
-    elasticsearch-api (8.13.0)
+      elasticsearch-api (= 8.15.0)
+    elasticsearch-api (8.15.0)
       multi_json
-    excon (0.110.0)
-    faraday (2.9.2)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-excon (2.1.0)
-      excon (>= 0.27.4)
-      faraday (~> 2.0)
-    faraday-net_http (3.1.1)
+    excon (1.1.1)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-excon (2.3.0)
+      excon (>= 1.0.0)
+      faraday (>= 2.11.0, < 3)
+    faraday-net_http (3.3.0)
       net-http
     faraday_middleware-aws-sigv4 (1.0.1)
       aws-sigv4 (~> 1.0)
@@ -49,10 +53,14 @@ GEM
     fluent-plugin-prometheus (2.2.0)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
-    fluentd (1.16.5)
+    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)
@@ -63,16 +71,20 @@ GEM
       yajl-ruby (~> 1.0)
     http_parser.rb (0.8.0)
     jmespath (1.6.2)
-    msgpack (1.7.2)
+    json (2.7.6)
+    logger (1.6.1)
+    msgpack (1.7.3)
     multi_json (1.15.0)
     net-http (0.4.1)
       uri
-    opensearch-ruby (3.3.0)
+    opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
     prometheus-client (4.2.3)
       base64
-    serverengine (2.3.2)
+    serverengine (2.4.0)
+      base64 (~> 0.1)
+      logger (~> 1.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
@@ -81,7 +93,7 @@ GEM
     tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     uri (0.13.1)
-    webrick (1.8.2)
+    webrick (1.9.0)
     yajl-ruby (1.4.3)
 
 PLATFORMS
@@ -92,7 +104,7 @@ DEPENDENCIES
   fluent-plugin-elasticsearch (= 5.4.3)
   fluent-plugin-opensearch (= 1.1.5)
   fluent-plugin-prometheus (= 2.2.0)
-  fluentd (= 1.16.5)
+  fluentd (= 1.17.1)
 
 BUNDLED WITH
-   2.5.7
+   2.5.22
diff --git 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.1-1.1 \
 		lock --update
diff --git 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.1-1.1
 
 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/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.10.0"
-gem "fluentd", "1.16.5"
+gem "fluentd", "1.17.1"
diff --git a/logs-dispatcher/Gemfile.lock b/logs-dispatcher/Gemfile.lock
@@ -5,34 +5,36 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     amq-protocol (2.3.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.930.0)
-    aws-sdk-cloudwatchlogs (1.82.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.1001.0)
+    aws-sdk-cloudwatchlogs (1.100.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.81.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.169.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sdk-sqs (1.74.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-sqs (1.87.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bunny (2.14.4)
       amq-protocol (~> 2.3, >= 2.3.0)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     cool.io (1.9.0)
+    csv (3.3.0)
     domain_name (0.6.20240107)
+    drb (2.2.1)
     ffi (1.17.0-x86_64-linux-gnu)
     ffi (1.17.0-x86_64-linux-musl)
     ffi-compiler (1.3.2)
@@ -85,10 +87,14 @@ GEM
     fluent-plugin-sumologic_output (1.10.0)
       fluentd
       httpclient
-    fluentd (1.16.5)
+    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)
@@ -110,37 +116,43 @@ GEM
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.7.6)
     jsonpath (1.1.5)
       multi_json
-    kubeclient (4.11.0)
+    kubeclient (4.12.0)
       http (>= 3.0, < 6.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
+    logger (1.6.1)
     lru_redux (1.1.0)
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.1001)
     msgpack (1.7.3)
     multi_json (1.15.0)
-    net-http-persistent (4.0.2)
+    net-http-persistent (4.0.4)
       connection_pool (~> 2.2)
     netrc (0.11.0)
+    ostruct (0.6.0)
     prometheus-client (4.2.3)
       base64
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
     rake (13.2.1)
-    recursive-open-struct (1.2.2)
+    recursive-open-struct (1.3.1)
+      ostruct
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    serverengine (2.3.2)
+    serverengine (2.4.0)
+      base64 (~> 0.1)
+      logger (~> 1.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
@@ -150,7 +162,7 @@ GEM
     tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     uuidtools (2.2.0)
-    webrick (1.8.2)
+    webrick (1.9.0)
     yajl-ruby (1.4.3)
 
 PLATFORMS
@@ -172,7 +184,7 @@ DEPENDENCIES
   fluent-plugin-s3 (= 1.7.2)
   fluent-plugin-splunk-enterprise (= 0.10.2)
   fluent-plugin-sumologic_output (= 1.10.0)
-  fluentd (= 1.16.5)
+  fluentd (= 1.17.1)
 
 BUNDLED WITH
-   2.5.7
+   2.5.22
diff --git 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.1-1.1 \
 		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.1-1.1 \
 		cache