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 line wrapping in sidecar default configs for filebeat #21043

Merged
merged 5 commits into from
Dec 5, 2024

Conversation

thll
Copy link
Contributor

@thll thll commented Nov 25, 2024

Sidecar default configuration templates for filebeat have the line wrapping messed up. For new clusters, or clusters that don't have the default templates present, invalid configuration will be created. See the following preview:

image

This PR fixes that by modifying the templates for newly created configurations. After applying the PR, the default configuration from above should look like this:

image

However, this won't fix existing configurations.

@thll thll requested a review from AntonEbel November 25, 2024 07:47
@thll thll marked this pull request as ready for review November 25, 2024 07:48
@thll
Copy link
Contributor Author

thll commented Nov 25, 2024

@AntonEbel, do you have any idea why this was broken? I'm pretty sure the configs were tested when they were added. Also, I only tested the Darwin configs. It would be great if you could give the other configs a quick test.

@AntonEbel
Copy link
Contributor

However, this won't fix existing configurations.

If the user has not changed the broken configurations, the “checksum migration” should work and we would replace them with the working configurations. Or am I wrong? @thll

@AntonEbel
Copy link
Contributor

Just for traceability, this bug came in with #15571. The configurations were provided by secdev in this PR https://github.com/Graylog2/graylog-project-illuminate/issues/1384.

@thll
Copy link
Contributor Author

thll commented Dec 5, 2024

If the user has not changed the broken configurations, the “checksum migration” should work and we would replace them with the working configurations. Or am I wrong? @thll

Right, if they didn't touch the config then it will be repaired.

@thll thll requested a review from AntonEbel December 5, 2024 08:47
Copy link
Contributor

@AntonEbel AntonEbel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AntonEbel AntonEbel merged commit 8839b04 into master Dec 5, 2024
6 checks passed
@AntonEbel AntonEbel deleted the fix/sidecar-default-configs branch December 5, 2024 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants