-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
[8.7](backport #34456) Report FQDN on host.name enabled by a feature flag #34860
Conversation
This pull request doesn't have a |
I see the conflicts and will work on resolving them. |
This pull request has not been merged yet. Could you please review and merge it @ycombinator? 🙏 |
60ecd1d
to
6d8820c
Compare
The CI failures are (somehow) related to this backport PR. They are not happening on the |
The CI failures seem to be happening because this backport PR updates the dependency on These changes were done on the |
@ycombinator is there a reason the I assume the original backport was never merged as the shipper isn't supported, so we weren't worried about backports. I kind of don't want to put ourselves in a situation where we're trying to fix shipper code on releases where the shipper doesn't actually work and isn't supported, but just merging that backport might be the easiest solution, I'm not sure. |
I'm glad you asked about this 🙂. Looking at the original PR (#34456), it does not upgrade the |
faf3aa6
to
59d56ce
Compare
This pull request is now in conflicts. Could you fix it? 🙏
|
This pull request has not been merged yet. Could you please review and merge it @ycombinator? 🙏 |
* wip * wip * wip * something is broken * debug logs * avoid panics * wip broken * wip - perhaps fixed double configuring features * using triggers to know what changed * it works, but the agent-client is sending feature changes every time * debug logs * more debug logs * wip * it works * remove debug logs * fix after rebase * update elastic-agent-client and make notice * license headres * Add TODO for Winlogbeat FQDN implementation * Removing unnecesary code * Use RWMutex for greater read efficiency * Move mutex inside struct * Better error handling * Temporarily updating dependency * Always store FQDN in Beat info * Set hostname in monitoring registries after FQDN config has been evaluated * Pass down FQDN flag from add_host_metadata processor * Better error handling * Add temporary notice override * Changing log level * Update dependency on elastic-agent-system-metrics * Running go mod tidy * Update elastic-agent-system-metrics dependency version * Add feature flags configuration section to reference yml * Bump up version of elastic-agent-client depdendency * Updating reference file * Updating reference files * Move feature flags setting into same method where log level setting is handled * Updating docs * Adding CHANGELOG entry * Remove replace directive for go-sysinfo * Running go mod tidy * Remove replace directive for elastic-agent-client dependency * Remove personal repos from overrides.json * Updating NOTICE * Bump up version for elastic-agent-client dependency * Update NOTICE * Removing noisy debug logging * Removing commented out code that's not needed * Fixing error message * Make default flag setting more explicit * Adding config with no features to unit test * Add helper method to beat.Info for returning FQDN-aware hostname * Adding license header to test file * Remove use of errors package * Check error from data.Put * Expire add_host_metadata cache immediately on FQDN feature flag value change * Fix casing in error message * Have callback registration function accept ID * Fixing go formatting * Account for feature flags in TestManagerV2 test * Update logging for unit changes * Remove TODO from wineventlog code * Updating dependency * Include shared file in docs * Bumping dependency on elastic-agent-client * Include features config in diagnostics output * Update comment * Updating NOTICE * Re-formatting * Running make update --------- Co-authored-by: Shaunak Kashyap <[email protected]> (cherry picked from commit faf4c11) # Conflicts: # go.mod # go.sum
59d56ce
to
3a2a102
Compare
This is an automatic backport of pull request #34456 done by Mergify.
Cherry-pick of faf4c11 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com