Manual backport of #2905 into release/1.1.x#2924
Merged
Ganeshrockz merged 3 commits intorelease/1.1.xfrom Sep 8, 2023
Merged
Conversation
asheshvidyut
approved these changes
Sep 8, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is manually backported from the #2905 and raised against
1.1.x.The below text is copied from the body of the original PR.
Changes proposed in this PR:
where
rotate_max_filesandrotate_bytesget passed as string inputs to the server configuration file. This PR makes sure to perform special handling forrotate_max_filesandrotate_byteswhere they don't get passed with quotes.Generated config (Before the fix)
{ "audit": { "enabled": true, "sink": { "MySink": { "delivery_guarantee": "best-effort", "format": "json", "path": "/tmp/audit.json", "rotate_bytes": "12455355", // note the presence of braces here "rotate_duration": "24h", "rotate_max_files": "20", "type": "file" } } } }Generated config (After the fix)
{ "audit": { "enabled": true, "sink": { "MySink": { "delivery_guarantee": "best-effort", "format": "json", "path": "/tmp/audit.json", "rotate_bytes": 12455355, // note the absence of braces here "rotate_duration": "24h", "rotate_max_files": 20, "type": "file" } } } }How I've tested this PR:
How I expect reviewers to test this PR:
👀
Checklist: