custom_calyptia: switch to YAML for Fleet config #9698
Merged
+411
−98
Conversation
This file contains 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
This comment was marked as outdated.
This comment was marked as outdated.
patrick-stephens
force-pushed
the
sc118908_fleet_yaml_support
branch
2 times, most recently
from
c4497dc to
05d83b1
Compare
Done. |
patrick-stephens
changed the title
Signed-off-by: Patrick Stephens <[email protected]>
patrick-stephens
force-pushed
the
sc118908_fleet_yaml_support
branch
from
05d83b1 to
14e2476
Compare
Signed-off-by: Patrick Stephens <[email protected]>
pwhelan
approved these changes
Jan 8, 2025
niedbalski
approved these changes
Jan 10, 2025
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.
Updates to using YAML for Fleet configuration now it is completed in 3.2 series.
We have added this as a configurable option now with the default set to the current TOML to keep backwards behaviour - users can opt-in to YAML format and then we can also switch the default in the future.
fleet_config_legacy_format on== current INI/TOML format and the defaultfleet_config_legacy_format off== YAML formatIn each case note the initial configuration will be assumed to be TOML, not changing installation and packaging for that.
Includes changes from cprofiles to resolve macOS failures, these should not cause an issue once that PR is merged: fluent/cprofiles#7Resolves the usage of
booltype in the plugin and replaces with standardintflag approach.Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
Confirmed all fleet config files are YAML:
$ sudo find /tmp/calyptia-fleet/ /tmp/calyptia-fleet/ /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4 /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4/yaml-fleet /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4/yaml-fleet/1733416866 /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4/yaml-fleet/cur.yaml /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4/yaml-fleet/header.yaml /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4/yaml-fleet/1733416866.yaml /tmp/calyptia-fleet/machine-id.conf $ sudo cat /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4/yaml-fleet/1733416866.yaml includes: - /tmp/calyptia-fleet/dc86c10731acee376c73985ff88b8ec86888e045d6af2ccf045f94b55e834be4/yaml-fleet/header.yaml pipeline: inputs: - name: dummy dummy: '{"message": "custom dummy"}' outputs: - name: stdout match: '*'If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).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.