Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix graylog connecting issue #1506

Merged
merged 3 commits into from
Jul 12, 2024
Merged

Fix graylog connecting issue #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f07ee2b
Fix graylog connecting issue
kenhys Jul 11, 2024
48d726d
Bump version to v1.17.0-1.2
kenhys Jul 12, 2024
46aadcc
Add v1.17.0-1.2 graylog images
kenhys Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ X86_IMAGES := \
v1.17/debian-syslog:v1.17.0-debian-syslog-amd64-1.1,v1.17-debian-syslog-amd64-1 \
v1.17/debian-forward:v1.17.0-debian-forward-amd64-1.1,v1.17-debian-forward-amd64-1 \
v1.17/debian-gcs:v1.17.0-debian-gcs-amd64-1.1,v1.17-debian-gcs-amd64-1 \
v1.17/debian-graylog:v1.17.0-debian-graylog-amd64-1.1,v1.17-debian-graylog-amd64-1 \
v1.17/debian-graylog:v1.17.0-debian-graylog-amd64-1.2,v1.17-debian-graylog-amd64-1 \
v1.17/debian-papertrail:v1.17.0-debian-papertrail-amd64-1.1,v1.17-debian-papertrail-amd64-1 \
v1.17/debian-logzio:v1.17.0-debian-logzio-amd64-1.1,v1.17-debian-logzio-amd64-1 \
v1.17/debian-kafka:v1.17.0-debian-kafka-amd64-1.1,v1.17-debian-kafka-amd64-1 \
Expand All @@ -44,7 +44,7 @@ ARM64_IMAGES := \
v1.17/arm64/debian-syslog:v1.17.0-debian-syslog-arm64-1.1,v1.17-debian-syslog-arm64-1 \
v1.17/arm64/debian-forward:v1.17.0-debian-forward-arm64-1.1,v1.17-debian-forward-arm64-1 \
v1.17/arm64/debian-gcs:v1.17.0-debian-gcs-arm64-1.1,v1.17-debian-gcs-arm64-1 \
v1.17/arm64/debian-graylog:v1.17.0-debian-graylog-arm64-1.1,v1.17-debian-graylog-arm64-1 \
v1.17/arm64/debian-graylog:v1.17.0-debian-graylog-arm64-1.2,v1.17-debian-graylog-arm64-1 \
v1.17/arm64/debian-papertrail:v1.17.0-debian-papertrail-arm64-1.1,v1.17-debian-papertrail-arm64-1 \
v1.17/arm64/debian-logzio:v1.17.0-debian-logzio-arm64-1.1,v1.17-debian-logzio-arm64-1 \
v1.17/arm64/debian-kafka:v1.17.0-debian-kafka-arm64-1.1,v1.17-debian-kafka-arm64-1 \
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.17/arm64/debian-graylog/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0"
gem "ffi"
Expand Down
4 changes: 2 additions & 2 deletions docker-image/v1.17/arm64/debian-graylog/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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)
Expand Down Expand Up @@ -137,7 +137,7 @@ DEPENDENCIES
fluent-plugin-rewrite-tag-filter (~> 2.4.0)
fluent-plugin-systemd (~> 1.0.5)
fluentd (= 1.17.0)
gelf (= 3.0.0)
gelf
oj (~> 3.15.0)
rexml (~> 3.2.5)

Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.17/arm64/debian-graylog/hooks/post_push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.17.0-debian-graylog-arm64-1.1,v1.17-debian-graylog-arm64-1}; do
for tag in {v1.17.0-debian-graylog-arm64-1.2,v1.17-debian-graylog-arm64-1}; 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
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.17/debian-graylog/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0"
gem "ffi"
Expand Down
4 changes: 2 additions & 2 deletions docker-image/v1.17/debian-graylog/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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)
Expand Down Expand Up @@ -137,7 +137,7 @@ DEPENDENCIES
fluent-plugin-rewrite-tag-filter (~> 2.4.0)
fluent-plugin-systemd (~> 1.0.5)
fluentd (= 1.17.0)
gelf (= 3.0.0)
gelf
oj (~> 3.15.0)
rexml (~> 3.2.5)

Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.17/debian-graylog/hooks/post_push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.17.0-debian-graylog-amd64-1.1,v1.17-debian-graylog-amd64-1}; do
for tag in {v1.17.0-debian-graylog-amd64-1.2,v1.17-debian-graylog-amd64-1}; 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
Expand Down
2 changes: 1 addition & 1 deletion templates/Gemfile.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down