Merge pull request fluent#1508 from kenhys/backport-graylog

Backport graylog connection issue for v1.16
kenhys · Jul 12, 2024 · db960da · db960da
2 parents afa4c3f + cf9b127
commit db960da
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ X86_IMAGES := \
 	v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.1,v1.16-debian-syslog-amd64-2 \
 	v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.1,v1.16-debian-forward-amd64-2 \
 	v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.1,v1.16-debian-gcs-amd64-2 \
-	v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.1,v1.16-debian-graylog-amd64-2 \
+	v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2 \
 	v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.1,v1.16-debian-papertrail-amd64-2 \
 	v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.1,v1.16-debian-logzio-amd64-2 \
 	v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.1,v1.16-debian-kafka-amd64-2 \
@@ -44,7 +44,7 @@ ARM64_IMAGES := \
 	v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.1,v1.16-debian-syslog-arm64-2 \
 	v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.1,v1.16-debian-forward-arm64-2 \
 	v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.1,v1.16-debian-gcs-arm64-2 \
-	v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.1,v1.16-debian-graylog-arm64-2 \
+	v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2 \
 	v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.1,v1.16-debian-papertrail-arm64-2 \
 	v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.1,v1.16-debian-logzio-arm64-2 \
 	v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.1,v1.16-debian-kafka-arm64-2 \

diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile b/docker-image/v1.16/arm64/debian-graylog/Gemfile
@@ -15,7 +15,7 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0"
 gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
 gem "fluent-plugin-parser-cri", "~> 0.1.0"
-gem "gelf", "3.0.0"
+gem "gelf"
 gem "fluent-plugin-gelf-hs", "~> 1.0.7"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0"
 gem "ffi"

diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
       tzinfo-data (~> 1.0)
       webrick (~> 1.4)
       yajl-ruby (~> 1.0)
-    gelf (3.0.0)
+    gelf (3.1.0)
       json
     http (5.2.0)
       addressable (~> 2.8)
@@ -132,7 +132,7 @@ DEPENDENCIES
   fluent-plugin-rewrite-tag-filter (~> 2.4.0)
   fluent-plugin-systemd (~> 1.0.5)
   fluentd (= 1.16.5)
-  gelf (= 3.0.0)
+  gelf
   oj (~> 3.15.0)
   rexml (~> 3.2.5)
 

diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push
@@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download
 chmod +x manifest-tool
 
 # Tag and push image and manifest list for each additional tag
-for tag in {v1.16.5-debian-graylog-arm64-1.1,v1.16-debian-graylog-arm64-2}; do
+for tag in {v1.16.5-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
   # Note: this will fail until both the amd64 and arm64 images have been pushed

diff --git a/docker-image/v1.16/debian-graylog/Gemfile b/docker-image/v1.16/debian-graylog/Gemfile
@@ -15,7 +15,7 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0"
 gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
 gem "fluent-plugin-parser-cri", "~> 0.1.0"
-gem "gelf", "3.0.0"
+gem "gelf"
 gem "fluent-plugin-gelf-hs", "~> 1.0.7"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0"
 gem "ffi"

diff --git a/docker-image/v1.16/debian-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
       tzinfo-data (~> 1.0)
       webrick (~> 1.4)
       yajl-ruby (~> 1.0)
-    gelf (3.0.0)
+    gelf (3.1.0)
       json
     http (5.2.0)
       addressable (~> 2.8)
@@ -132,7 +132,7 @@ DEPENDENCIES
   fluent-plugin-rewrite-tag-filter (~> 2.4.0)
   fluent-plugin-systemd (~> 1.0.5)
   fluentd (= 1.16.5)
-  gelf (= 3.0.0)
+  gelf
   oj (~> 3.15.0)
   rexml (~> 3.2.5)
 

diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push
@@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download
 chmod +x manifest-tool
 
 # Tag and push image and manifest list for each additional tag
-for tag in {v1.16.5-debian-graylog-amd64-1.1,v1.16-debian-graylog-amd64-2}; do
+for tag in {v1.16.5-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
   # Note: this will fail until both the amd64 and arm64 images have been pushed

diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb
@@ -45,7 +45,7 @@ gem "fluent-plugin-s3", "~> 1.7.0"
 <% when "gcs" %>
 gem "fluent-plugin-gcs", "0.4.2"
 <% when "graylog" %>
-gem "gelf", "3.0.0"
+gem "gelf"
 gem "fluent-plugin-gelf-hs", "~> 1.0.7"
 <% when "logzio" %>
 gem "fluent-plugin-logzio", "~> 0.2.2"