Backport 17203 and 17267 fedramp8x #17271
Open
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.
Release notes
From #17203:
What does this PR do?
Combined backports of #17203 and #17267 to
feature/fedramp-high-8.x
#17203 includes a regression to the behavior of
bin/logstash-plugin install
's--preserve
flag, which was addressed in #17267.CONFLICTS:
:skip_fips
flags were addedWhy is it important/What is the impact to the user?
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files (and/or docker env variables)Author's Checklist
How to test this PR locally
From #17203:
From #17267 (edited to be relevant to this PR):