-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
[Fleet] Fix config migration from ingestManager to support both xpack.ingestManager and xpack.fleet #111612
[Fleet] Fix config migration from ingestManager to support both xpack.ingestManager and xpack.fleet #111612
Conversation
….fleet and xpack.ingestManager config values
Pinging @elastic/fleet (Team:Fleet) |
@elasticmachine merge upstream |
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: cc @nchaulet |
LGTM, should we include all bug fixes in release_note:fix label? |
I think it depend of the bug and the target branches, when I target oldest branch (7.14 here) I try to add it. |
….fleet and xpack.ingestManager config values (elastic#111612)
….fleet and xpack.ingestManager config values (elastic#111612)
….fleet and xpack.ingestManager config values (elastic#111612)
….fleet and xpack.ingestManager config values (#111612) (#111716) Co-authored-by: Nicolas Chaulet <[email protected]>
….fleet and xpack.ingestManager config values (#111612) (#111715) Co-authored-by: Nicolas Chaulet <[email protected]>
….fleet and xpack.ingestManager config values (#111612) (#111714) Co-authored-by: Nicolas Chaulet <[email protected]>
commit ef2a4085f1b8eb25dd32d13428d7d5de9c1148cc Author: Timothy Sullivan <[email protected]> Date: Thu Sep 9 11:57:50 2021 -0700 update snapshot commit 750b55fbfad1621d58d6bb3534696fba4977a4c2 Author: Timothy Sullivan <[email protected]> Date: Thu Sep 9 10:00:05 2021 -0700 update snapshots commit 4d133f28a1a81f090281f61d03c084e97c1c69a3 Author: Timothy Sullivan <[email protected]> Date: Wed Sep 8 23:57:48 2021 -0700 allow reporting tests to pass in cloud commit 7dead38811bf50f12f028713e2c95be5a90f6962 Author: Timothy Sullivan <[email protected]> Date: Wed Sep 8 23:39:37 2021 -0700 fix discover csv tests commit 030cefe5457458b14af0bbf24adf4a85fcbb472c Author: Timothy Sullivan <[email protected]> Date: Wed Sep 8 23:03:38 2021 -0700 [Reporting] use default settings in test server config commit fd6c1d1 Author: Kibana Machine <[email protected]> Date: Thu Sep 9 14:28:05 2021 -0400 Use correct z-index for timeline global footer (elastic#111492) (elastic#111749) Co-authored-by: Kevin Qualters <[email protected]> commit 506b09b Author: Kibana Machine <[email protected]> Date: Thu Sep 9 14:17:55 2021 -0400 [ML] Functional tests - skip color assertions in cloud (elastic#111695) (elastic#111751) This PR skips color assertions during functional tests in cloud environments. Co-authored-by: Robert Oskamp <[email protected]> commit e767408 Author: Kaarina Tungseth <[email protected]> Date: Thu Sep 9 11:53:57 2021 -0500 [DOCS] Adds preview to runtime fields (elastic#110327) (elastic#111765) * [DOCS] Adds preview to runtime fields * Final draft changes * Review comments commit 99533b6 Author: Lisa Cawley <[email protected]> Date: Thu Sep 9 08:41:39 2021 -0700 [7.15][DOCS] APM failed transaction correlations elastic#111219 (elastic#111666) commit f1dc752 Author: Kibana Machine <[email protected]> Date: Thu Sep 9 11:36:24 2021 -0400 [Metrics UI] Remove rounding from Metric Threshold start time (elastic#111634) (elastic#111727) * [Metrics UI] Remove rounding from Metric Threshold start time * adding missed files Co-authored-by: Chris Cowan <[email protected]> commit 99789fe Author: Kibana Machine <[email protected]> Date: Thu Sep 9 11:02:54 2021 -0400 [Fleet] Fix config migration from ingestManager to support both xpack.fleet and xpack.ingestManager config values (elastic#111612) (elastic#111714) Co-authored-by: Nicolas Chaulet <[email protected]> commit d82c54f Author: Kibana Machine <[email protected]> Date: Thu Sep 9 10:12:32 2021 -0400 [Security Solution] add timeline id to context (elastic#111435) (elastic#111711) * add timeline context * remove an unused file Co-authored-by: Angela Chuang <[email protected]> commit e584d54 Author: Kibana Machine <[email protected]> Date: Thu Sep 9 06:56:48 2021 -0400 Fix focus jumps from Case description box back to Alerts table with first <return> keystroke (elastic#111273) (elastic#111691) Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Pablo Machado <[email protected]>
Description
Fix #111278
Allow the config to specify both
xpack.ingestManager
andxpack.fleet
.Added some test that we were missing here.
I added 7.14.2 as a target version let me know what do you think?
Release note
Fix a bug when both legacy
xpack.ingestManager
andxpack.fleet
settings were setxpack.fleet
was not used.How to test
xpack.ingestManager.registryUrl
xpack.fleet.registryProxyUrl
registryProxyUrl
setting received by the plugin is set andregistryUrl
is defined too.