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

Jump to bottom

Add fluentd17 support #68

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Add fluentd17 support #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0bb9059
chore(deps): update dependency fluentd to v1.17.0
renovate[bot] May 21, 2024
1146882
chore(deps): update fluent/fluentd docker tag to v1.17.0
renovate[bot] May 21, 2024
758aa40
Merge remote-tracking branch 'origin/renovate/fluent-fluentd-1.x' int…
tobybellwood May 21, 2024
c5b86a8
Merge remote-tracking branch 'origin/renovate/fluentd-1.x' into fluen…
tobybellwood May 21, 2024
74f7d44
chore: update for fluentd 1.17.0
tobybellwood May 21, 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
2 changes: 1 addition & 1 deletion logs-concentrator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion logs-concentrator/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
16 changes: 11 additions & 5 deletions logs-concentrator/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@ 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)
aws-sigv4 (~> 1.8)
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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
2.5.10
2 changes: 1 addition & 1 deletion logs-concentrator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion logs-dispatcher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion logs-dispatcher/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions logs-dispatcher/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading