Skip to content

Conversation

@patrick-stephens
Copy link
Collaborator

@patrick-stephens patrick-stephens commented Dec 4, 2024

/etc/machine-id is not guaranteed to be unique so instead we generate a UUID locally to use in the fleet config directory. On first boot this will be created but after that should be reloaded.

macOS builds are still blocked by cprofiles issue, unrelated to this change.


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.

Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Patrick Stephens <[email protected]>
Patrick Stephens added 2 commits December 4, 2024 14:04
Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Patrick Stephens <[email protected]>
@patrick-stephens
Copy link
Collaborator Author

Unrelated unit test failures tracked here: #9682

@niedbalski niedbalski merged commit 3e96ec5 into master Dec 5, 2024
46 of 50 checks passed
@niedbalski niedbalski deleted the sc113223_uuid_fleet_machine_id_generation branch December 5, 2024 16:30
scne59 pushed a commit to scne59/fluent-bit that referenced this pull request Apr 9, 2025
* calyptia: generate machine id for fleet agents

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: add missing include

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: add missing include

Signed-off-by: Patrick Stephens <[email protected]>

* tests: resolve conflicting definitions

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve missing bool type

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve missing header

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve duplicate symbols for tests

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve function pointer usage

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: update codeowners

Signed-off-by: Patrick Stephens <[email protected]>

* custom_calyptia: tests: Add missing declarations

To link those missing declaration functions, we need to define for stub
in the custom_calyptia testing files.

Signed-off-by: Hiroshi Hatake <[email protected]>

* custom_calyptia: Remove duplicated function declarations

Signed-off-by: Hiroshi Hatake <[email protected]>

* tests: add calyptia machine id generation tests

Signed-off-by: Patrick Stephens <[email protected]>

* tests: add missing header

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix typos

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix typos

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix memory issues

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix location

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix destroy usage

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix destroy usage

Signed-off-by: Patrick Stephens <[email protected]>

---------

Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Hiroshi Hatake <[email protected]>
Co-authored-by: Hiroshi Hatake <[email protected]>
nourdouf pushed a commit to seveas/fluent-bit that referenced this pull request Sep 23, 2025
* calyptia: generate machine id for fleet agents

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: add missing include

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: add missing include

Signed-off-by: Patrick Stephens <[email protected]>

* tests: resolve conflicting definitions

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve missing bool type

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve missing header

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve duplicate symbols for tests

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: resolve function pointer usage

Signed-off-by: Patrick Stephens <[email protected]>

* calyptia: update codeowners

Signed-off-by: Patrick Stephens <[email protected]>

* custom_calyptia: tests: Add missing declarations

To link those missing declaration functions, we need to define for stub
in the custom_calyptia testing files.

Signed-off-by: Hiroshi Hatake <[email protected]>

* custom_calyptia: Remove duplicated function declarations

Signed-off-by: Hiroshi Hatake <[email protected]>

* tests: add calyptia machine id generation tests

Signed-off-by: Patrick Stephens <[email protected]>

* tests: add missing header

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix typos

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix typos

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix memory issues

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix location

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix destroy usage

Signed-off-by: Patrick Stephens <[email protected]>

* tests: fix destroy usage

Signed-off-by: Patrick Stephens <[email protected]>

---------

Signed-off-by: Patrick Stephens <[email protected]>
Signed-off-by: Hiroshi Hatake <[email protected]>
Co-authored-by: Hiroshi Hatake <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants