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.

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: Add Buffer to Gelf Outputs #1720

Merged
merged 9 commits into from
Apr 30, 2024

Conversation

bmichalkiewicz
Copy link
Contributor

This PullRequest adds a buffer section to Gelf Outputs and ClusterOutputs.
This might be a bug/mistake as deployed config has a buffer section with flush_mode.

@pepov pepov requested a review from OverOrion April 18, 2024 14:41
@bmichalkiewicz
Copy link
Contributor Author

Hey @pepov, I tested it on my development environment and encountered some errors: config error file="/fluentd/etc/fluent.conf" error_class=Fluent::ConfigError error="this plugin 'Fluent::GELFOutput' cannot handle arguments for <buffer ...> section

Since the project https://github.com/hotschedules/fluent-plugin-gelf-hs is no longer maintained, I forked it and made a few changes to get it working properly. The buffer is functioning correctly, and the logs are fine.

@pepov
Copy link
Member

pepov commented Apr 19, 2024

Can you perhaps release a gem from it?

@bmichalkiewicz
Copy link
Contributor Author

bmichalkiewicz commented Apr 19, 2024

@bmichalkiewicz
Copy link
Contributor Author

Hey, gelf without buffor is useless, we need it so any ideas what do I need to do to replace no longer maintanced plugin with my forked ? We are extensively testing it and works like a charm

@pepov
Copy link
Member

pepov commented Apr 25, 2024

We need to pull it into these dockerfiles to replace the originals I just didn't have the time to do this already:
https://github.com/kube-logging/fluentd-images

@bmichalkiewicz
Copy link
Contributor Author

oh fine, take your time 👍

@pepov pepov added this to the 4.7 milestone Apr 29, 2024
@pepov pepov assigned pepov and OverOrion and unassigned pepov Apr 29, 2024
@pepov
Copy link
Member

pepov commented Apr 29, 2024

@bmichalkiewicz this will be available once https://github.com/kube-logging/fluentd-images/actions/runs/8878985879 has been built, with build number 139, I think we should add that image ref as a comment: ghcr.io/kube-logging/fluentd:v1.16-full-build.139

@pepov pepov added the enhancement New feature or request label Apr 29, 2024
Co-authored-by: Peter Wilcsinszky <[email protected]>
Signed-off-by: Bartosz Michałkiewicz <[email protected]>
@bmichalkiewicz
Copy link
Contributor Author

@pepov sure, commited :)

@pepov pepov enabled auto-merge April 29, 2024 16:43
@pepov
Copy link
Member

pepov commented Apr 29, 2024

@bmichalkiewicz sorry my suggestion broke make check-diff. Please rerun, commit and push and we are ready to accept this. FYI the next release is planned to be available May 21st but we can create a dev tag any time that triggers an image and chart pre-release as well.

@bmichalkiewicz
Copy link
Contributor Author

I have fluentd:v1.16-full-build.140 already on dev and works as expected
oh yeah, let's wait a second and will run it

auto-merge was automatically disabled April 29, 2024 17:07

Head branch was pushed to by a user without write access

Signed-off-by: Bartosz <[email protected]>
@bmichalkiewicz
Copy link
Contributor Author

bmichalkiewicz commented Apr 29, 2024

@pepov make check-diff works now

@bmichalkiewicz
Copy link
Contributor Author

@pepov fixed ci test

@OverOrion OverOrion merged commit 1fbebc8 into kube-logging:master Apr 30, 2024
17 checks passed
@bmichalkiewicz bmichalkiewicz deleted the gelf_buffer branch April 30, 2024 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants