Skip to content

[8.8] Fix config stacking order (#158827) - #159025

Merged
kibanamachine merged 2 commits into
elastic:8.8from
kibanamachine:backport/8.8/pr-158827
Jun 5, 2023
Merged

kibanamachine merged 2 commits into
elastic:8.8from
kibanamachine:backport/8.8/pr-158827

Conversation

@kibanamachine

Copy link
Copy Markdown
Contributor

Backport

This will backport the following commits from main to 8.8:

Questions ?

Please refer to the Backport tool documentation

## Summary
Fixes: elastic#155154 (introduced in elastic#149878), builds on elastic#155436 .

- Adds tests to ensure the configuration merging order, check those for
reference.
- Updates the README to explain the intention

For the tests, I needed to output something to the logs. I hope it's not
a big issue to log it. If needed, I might hide that behind a verbose- or
feature flag.

### Checklist

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit c57589e)
@kibanamachine kibanamachine added the backport This PR is a backport of another PR label Jun 5, 2023
@kibanamachine
kibanamachine enabled auto-merge (squash) June 5, 2023 13:21
@kibanamachine kibanamachine mentioned this pull request Jun 5, 2023
1 task done
@kibana-ci

Copy link
Copy Markdown

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
enterpriseSearch 17 19 +2
securitySolution 400 404 +4
total +6

Total ESLint disabled count

id before after diff
enterpriseSearch 18 20 +2
securitySolution 480 484 +4
total +6

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @delanni

@kibanamachine
kibanamachine merged commit 419cd20 into elastic:8.8 Jun 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants