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

fleet: use header with main configuration settings. #8102

Merged
merged 7 commits into from
Dec 11, 2023

Conversation

pwhelan
Copy link
Contributor

@pwhelan pwhelan commented Oct 27, 2023

Summary

Fleets save the information for connecting to the fleet into the temporary fleet configuration file. This pull request uses a header.conf file that is then included by the configuration files. This file gets overwritten on each invocation.

This has the advantage of being able to update the base configuration settings, and also allows adding labels with add_label, etc...


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:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

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.


@pwhelan pwhelan marked this pull request as draft October 27, 2023 23:18
@pwhelan pwhelan changed the base branch from master to pwhelan-fleet-multifile November 6, 2023 16:29
@pwhelan pwhelan force-pushed the pwhelan-fleet-header branch from 1aeb6c0 to fecc7e2 Compare November 6, 2023 20:11
@pwhelan pwhelan force-pushed the pwhelan-fleet-multifile branch from c22915e to e5e293a Compare November 7, 2023 04:07
Base automatically changed from pwhelan-fleet-multifile to master November 30, 2023 15:46
Download fleet files to a sub-directory with the timestamp of the relevant
configuration and allow it to be loaded by changing to that directory
when fluent-bit is reloaded.

  * Recurse through fleet files and download each one.
  * Change to the fleet files directory on reload so they can be referred
    to from the main fleet configuration file.
  * Delete old fleet file directories when the configuration is deleted.

Signed-off-by: Phillip Whelan <[email protected]>
…ration.

Use a header.conf file that is refreshed on each invocation of fluent-bit
to track the main configuration for the fleet agent. This file is then
included by the downloade fleet configuration files.

Signed-off-by: Phillip Whelan <[email protected]>
@pwhelan pwhelan force-pushed the pwhelan-fleet-header branch from fecc7e2 to e617c7b Compare December 1, 2023 15:14
@niedbalski niedbalski self-requested a review December 7, 2023 14:13
@pwhelan pwhelan marked this pull request as ready for review December 7, 2023 14:46
@niedbalski niedbalski requested a review from edsiper December 11, 2023 11:52
@edsiper edsiper merged commit 469652f into master Dec 11, 2023
42 checks passed
@edsiper edsiper deleted the pwhelan-fleet-header branch December 11, 2023 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants