in_systemd: add 'lowercase' option #4908
Merged
Conversation
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
chitoku-k
requested review from
edsiper,
fujimotos,
koleini and
leonardo-albertovich
as code owners
Contributor
Author
ConfigLogValgrind output |
edsiper
reviewed
Feb 24, 2022
plugins/in_systemd/systemd.c
Outdated
| msgpack_pack_str_body(&mp_pck, key, len); | ||
|
|
||
| if (ctx->lowercase == FLB_TRUE) { | ||
| tmp = flb_sds_create_len(key, len); |
Member
There was a problem hiding this comment.
I was wondering if we could re-use the original systemd buffer (pointed by key) to perform the lowercase conversion, can you check it ?
if the previous step is not possible, we might use a pre-allocated buffer for key conversion to avoid a tons of malloc/free on each record iteration. I see in the docs that usually records gets truncated at 64kb:
Contributor
Author
There was a problem hiding this comment.
Thank you for taking the time to review this pull request!
I've seen the manpage saying that ”returned data is in a read-only memory map” so chose not to overwritten the data directly; however, I see your point, so how about pre-allocating a buffer whose size is equal to the threshold from sd_journal_get_data_threshold() and increase it when it’s insufficient to hold the entire key? I’ve pushed the branch trying to reflect this.
This threshold is a hint only: it indicates that the client program is interested only in the initial parts of the data fields, up to the threshold in size — but the library might still return larger data objects. That means applications should not rely exclusively on this setting to limit the size of the data fields returned, but need to apply an explicit size limit on the returned data as well.
Member
There was a problem hiding this comment.
that looks pretty good :) , thank you!
chitoku-k
force-pushed
the
in-systemd-lowercase
branch
from
549e4ad to
4c0d4aa
Compare
Member
|
ah, pls rebase on top of GIT master to fix the conflicts so we can merge it |
edsiper
added
waiting-for-user
Signed-off-by: Chitoku <odango@chitoku.jp>
Signed-off-by: Chitoku <odango@chitoku.jp>
chitoku-k
force-pushed
the
in-systemd-lowercase
branch
from
4c0d4aa to
5e835b6
Compare
Contributor
Author
|
@edsiper |
Member
|
thank you!, it will be part of next release next week. would you please submit a PR for the docs too ? (cc: @lecaros) |
Contributor
Author
|
The PR for the docs is here: fluent/fluent-bit-docs#724 |
5 tasks
mgeriesa
pushed a commit
to mgeriesa/fluent-bit
that referenced
this pull request
Oct 25, 2022
* in_systemd: add 'lowercase' option Signed-off-by: Chitoku <odango@chitoku.jp> Signed-off-by: Manal Geries <mgeriesa@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This patch adds support of lowercase option for the systemd input plugin. The name of option is aligned to
https://github.com/fluent-plugin-systemd/fluent-plugin-systemd.
Addresses #1543
Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.