system_config: support built-in config files #4893
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
kenhys
changed the title
|
This is just a PoC. |
kenhys
force-pushed
the
builtin-confd
branch
6 times, most recently
from
238d9dc to
49f544d
Compare
kenhys
changed the title
kenhys
force-pushed
the
builtin-confd
branch
9 times, most recently
from
b1329d3 to
aa12263
Compare
kenhys
changed the title
kenhys
force-pushed
the
builtin-confd
branch
3 times, most recently
from
0bd54d9 to
30467dd
Compare
kenhys
added a commit
to kenhys/fluentd-docs-gitbook
that referenced
this pull request
Apr 15, 2025
See fluent/fluentd#4893 Signed-off-by: Kentaro Hayashi <[email protected]>
Watson1978
reviewed
Apr 16, 2025
Watson1978
reviewed
Apr 16, 2025
daipom
reviewed
Apr 16, 2025
daipom
reviewed
Apr 17, 2025
daipom
reviewed
Apr 17, 2025
daipom
reviewed
Apr 17, 2025
daipom
reviewed
Apr 17, 2025
daipom
reviewed
Apr 17, 2025
daipom
reviewed
Apr 22, 2025
daipom
reviewed
Apr 22, 2025
daipom
reviewed
Apr 22, 2025
daipom
reviewed
Apr 22, 2025
Currently @include directive supports to reuse configuration files, but no way to apply specific configuration files by default (without specifying to). In the previous versions, if you want to manage multiple configuration files, you must use @include directive explicitly. In this commit, add an option to specify the directory (e.g. /etc/fluent/conf.d) which stores additional configuration files. If there are such files under specified directory, they are loaded by default without @include directive. If you want to disable this feature, set empty string for config_include_dir "". Signed-off-by: Kentaro Hayashi <[email protected]>
Co-authored-by: Daijiro Fukuda <[email protected]> Signed-off-by: Kentaro Hayashi <[email protected]>
|
Rebased with master and squash feedback commits. |
daipom
reviewed
Apr 22, 2025
daipom
reviewed
Apr 22, 2025
Signed-off-by: Kentaro Hayashi <[email protected]>
Signed-off-by: Kentaro Hayashi <[email protected]>
Before: stub all Fluent::Config.build After stub first Fluent::Config.build, do not stub additional Fluent::Config.build Signed-off-by: Kentaro Hayashi <[email protected]>
|
Followed feedback (Use stub.proxy) |
|
Could you update the description of this PR?
|
|
Updated! |
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.
Which issue(s) this PR fixes:
N/A
What this PR does / why we need it:
Currently
@includedirective supports to reuse configuration files, but no way toapply specific configuration files by default (without specifying to).
For example, if this feature was merged, a specific configuration could be applied in any case for fluent-package.
By putting some conf files under /etc/fluent/conf.d/*.conf.
Docs Changes:
fluent/fluentd-docs-gitbook#577
Release Note: