Cherry-pick #9023 to 6.5: Unset existing config blocks when they are missing #9042
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
* Unset existing config blocks when they are missing When a configuration block type (ie output) is not set in Central Management, Kibana doesn't return it in the payload. Before this change, Beats was not taking that into account os missing block types were not reloaded in case they changed. In particular that means that if an output configuration exists and is removed, Beats won't apply that change. This PR fixes that behavior by detecting missing types and applying nil config to them. Fixes elastic#9010 (cherry picked from commit f805d6c)
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…astic#9042) * Unset existing config blocks when they are missing When a configuration block type (ie output) is not set in Central Management, Kibana doesn't return it in the payload. Before this change, Beats was not taking that into account os missing block types were not reloaded in case they changed. In particular that means that if an output configuration exists and is removed, Beats won't apply that change. This PR fixes that behavior by detecting missing types and applying nil config to them. Fixes elastic#9010 (cherry picked from commit 5410b93)
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.
Cherry-pick of PR #9023 to 6.5 branch. Original message:
When a configuration block type (ie output) is not set in Central
Management, Kibana doesn't return it in the payload.
Before this change, Beats was not taking that into account and missing
block types were not reloaded in case they changed. In particular that
means that if an output configuration exists and is removed, Beats won't
apply that change (disable the output).
This PR fixes that behavior by detecting missing types and applying nil
config to them.
Fixes #9010