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

flb_utils: add code to get the machine-id on windows machines. #7970

Merged
merged 1 commit into from
Oct 5, 2023

Conversation

pwhelan
Copy link
Contributor

@pwhelan pwhelan commented Sep 25, 2023

Summary

Add support for windows machines to the flb_utils function flb_utils_get_machine_id using the MachineGuid registry key in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Cryptography.

This is required for better fleet support since the default behavior in flb_utils_get_machine_id is to return a new UUID. This will lead to a new fleet configuration directory being created each time a fleet is invoked on a windows machine.


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 temporarily deployed to pr September 25, 2023 15:38 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr September 25, 2023 15:38 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr September 25, 2023 15:38 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr September 25, 2023 16:10 — with GitHub Actions Inactive
@pwhelan pwhelan added this to the Fluent Bit v2.1.11 milestone Sep 27, 2023
@pwhelan pwhelan force-pushed the pwhelan-fleet-windows-machine-id branch from 5b88ad7 to 9178d82 Compare October 4, 2023 13:23
@pwhelan pwhelan temporarily deployed to pr October 4, 2023 13:23 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr October 4, 2023 13:23 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr October 4, 2023 13:23 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr October 4, 2023 13:54 — with GitHub Actions Inactive
@edsiper edsiper merged commit 2aa8cdc into master Oct 5, 2023
42 checks passed
@edsiper edsiper deleted the pwhelan-fleet-windows-machine-id branch October 5, 2023 19:47
leonardo-albertovich pushed a commit that referenced this pull request Nov 3, 2023
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