From 3673898d153100ca11103b060657cba899d7892e Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Mon, 3 Feb 2020 20:54:59 -0800
Subject: [PATCH 1/8] Updates Monitoring alert Jest snapshots

A UI bump caused changes the EuiSuperSelect component which were not
reflected in kibana#54306. The EUI change went in after the PR went
green, but then failed once it hit master.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../configuration/__snapshots__/configuration.test.tsx.snap    | 1 +
 .../alerts/configuration/__snapshots__/step1.test.tsx.snap     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/configuration.test.tsx.snap b/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/configuration.test.tsx.snap
index f044e001700c5..429d19fbb887e 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/configuration.test.tsx.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/configuration.test.tsx.snap
@@ -7,6 +7,7 @@ exports[`Configuration shallow view should render step 1 1`] = `
     fullWidth={false}
     hasDividers={true}
     isInvalid={false}
+    isLoading={false}
     onChange={[Function]}
     options={
       Array [
diff --git a/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/step1.test.tsx.snap b/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/step1.test.tsx.snap
index fa03769ea3d09..94d951a94fe29 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/step1.test.tsx.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/__snapshots__/step1.test.tsx.snap
@@ -42,6 +42,7 @@ exports[`Step1 should render normally 1`] = `
     fullWidth={false}
     hasDividers={true}
     isInvalid={false}
+    isLoading={false}
     onChange={[Function]}
     options={
       Array [
@@ -135,6 +136,7 @@ exports[`Step1 testing should show a failed test error 1`] = `
     fullWidth={false}
     hasDividers={true}
     isInvalid={false}
+    isLoading={false}
     onChange={[Function]}
     options={
       Array [
@@ -220,6 +222,7 @@ exports[`Step1 testing should show a successful test 1`] = `
     fullWidth={false}
     hasDividers={true}
     isInvalid={false}
+    isLoading={false}
     onChange={[Function]}
     options={
       Array [

From 91c0e25ad83bdad3776fbcefea918d236ba347c8 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Tue, 4 Feb 2020 16:24:01 -0500
Subject: [PATCH 2/8] Fix tests from 160140338b80226181b1f76de061cb22e3c85c60
 (#56785)


From 33f937e118b36ddec8c1e0776bfec139fc7b83ec Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Tue, 4 Feb 2020 14:00:15 -0800
Subject: [PATCH 3/8] [docs] Update upgrade version path (#56658)

When upgrading to the next major version, users should first upgrade to
the last minor in the previous release. In 6.x this is 6.8.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 docs/setup/upgrade.asciidoc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc
index e05f5fc6d9690..8e230bfa74bfe 100644
--- a/docs/setup/upgrade.asciidoc
+++ b/docs/setup/upgrade.asciidoc
@@ -51,7 +51,7 @@ instructions.
 [[upgrade-6x]]
 === Upgrading from 6.x
 
-The recommended path is to upgrade to 6.7 before upgrading to 7.0. This makes it 
+The recommended path is to upgrade to 6.8 before upgrading to 7.0. This makes it 
 easier to identify the required changes, and enables you to use the Upgrade 
 Assistant to prepare for your upgrade to 7.0.
 
@@ -60,11 +60,11 @@ dashboards is supported.
 
 [float]
 [[upgrade-67]]
-=== Upgrading from 6.7
-To help you prepare for your upgrade to 7.0, 6.7 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[Upgrade Assistant] 
-To access the assistant, go to *Management > 7.0 Upgrade Assistant*. 
+=== Upgrading from 6.8
+To help you prepare for your upgrade to 7.0, 6.8 includes an https://www.elastic.co/guide/en/kibana/6.8/upgrade-assistant.html[Upgrade Assistant] 
+To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
 
-After you have addressed any issues that were identified by the Upgrade 
+After you have addressed any issues that were identified by the Upgrade
 Assistant, <<upgrade-standard,upgrade to 7.0>>.
 
 [float]

From f48c339f3f6c86ff65ea32bf82554b196022cd95 Mon Sep 17 00:00:00 2001
From: Andrew Goldstein <andrew-goldstein@users.noreply.github.com>
Date: Tue, 4 Feb 2020 16:55:28 -0700
Subject: [PATCH 4/8] [SIEM] Fixes Signals count spinner (#56797) (#56809)

## Fixes an issue where the Signals count spinner can spin forever

Per the animated gif below, in `7.6` `BC 4`, the `Signals count` spinner on the Overview page spins forever until the signals index is created (in the current Kibana space):

![signals-count-loading-spinner](https://user-images.githubusercontent.com/4459398/73785251-2ca42000-4754-11ea-8671-daa81f351c9b.gif)

The `Signals count` spinner will spin forever until the user clicks the `Detections` tab, which-in turn creates the signals index (if it doesn't exist), per the animated gif below:

![create-signals-index](https://user-images.githubusercontent.com/4459398/73785319-4ba2b200-4754-11ea-9bb0-a745a8b2be5d.gif)

This behavior is an issue because:

- When a fresh deployment is created on Elastic Cloud, a user won't understand why the `Signals count` widget is always spinning on the `Overview` page. (The user must click the `Detections` page to resolve this.)
- In deployments where authentication is disabled, or, for _reasons_, a Detections index will never be created, the `Signals count` spinner on the Overview page will always spin.

To reproduce:

1. Spin up a new `7.6` `BC 4` deployment on Elastic Cloud
2. Login to Kibana for the first time
3. Navigate to the SIEM app

**Expected result**
- All histograms on the Overview page eventually stop displaying their respective loading spinners

**Actual result**
- The `Signals count` widget spinner spins forever. (The user must click the `Detections` tab to create the signals index.)

## Deleting the signals index

To reproduce the issue above when a signals index has already been created (by clicking on the Detections tab), run the following from the Kibana `Dev Tools` `Console`:

```
DELETE /.siem-signals-default-000001
```

It is also possible to reproduce this issue by creating a new space, because it won't have a signals index.

https://github.com/elastic/siem-team/issues/514
---
 .../signals_histogram_panel/helpers.test.tsx  | 35 +++++++++++++++++++
 .../signals_histogram_panel/helpers.tsx       | 14 ++++++++
 .../signals_histogram_panel/index.tsx         | 16 +++++----
 .../detection_engine/detection_engine.tsx     |  1 -
 4 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.test.tsx

diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.test.tsx
new file mode 100644
index 0000000000000..2758625c0d4af
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.test.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { showInitialLoadingSpinner } from './helpers';
+
+describe('helpers', () => {
+  describe('showInitialLoadingSpinner', () => {
+    test('it should (only) show the spinner during initial loading, while we are fetching data', () => {
+      expect(showInitialLoadingSpinner({ isInitialLoading: true, isLoadingSignals: true })).toBe(
+        true
+      );
+    });
+
+    test('it should STOP showing the spinner (during initial loading) when the first data fetch completes', () => {
+      expect(showInitialLoadingSpinner({ isInitialLoading: true, isLoadingSignals: false })).toBe(
+        false
+      );
+    });
+
+    test('it should NOT show the spinner after initial loading has completed, even if the user requests more data (e.g. by clicking Refresh)', () => {
+      expect(showInitialLoadingSpinner({ isInitialLoading: false, isLoadingSignals: true })).toBe(
+        false
+      );
+    });
+
+    test('it should NOT show the spinner after initial loading has completed', () => {
+      expect(showInitialLoadingSpinner({ isInitialLoading: false, isLoadingSignals: false })).toBe(
+        false
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx
index 551850fa610db..27ee552146092 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx
@@ -76,3 +76,17 @@ export const getSignalsHistogramQuery = (
     },
   },
 });
+
+/**
+ * Returns `true` when the signals histogram initial loading spinner should be shown
+ *
+ * @param isInitialLoading The loading spinner will only be displayed if this value is `true`, because after initial load, a different, non-spinner loading indicator is displayed
+ * @param isLoadingSignals When `true`, IO is being performed to request signals (for rendering in the histogram)
+ */
+export const showInitialLoadingSpinner = ({
+  isInitialLoading,
+  isLoadingSignals,
+}: {
+  isInitialLoading: boolean;
+  isLoadingSignals: boolean;
+}): boolean => isInitialLoading && isLoadingSignals;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx
index 29aaa951ff71a..4de471d6733cf 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx
@@ -23,7 +23,7 @@ import { InspectButtonContainer } from '../../../../components/inspect';
 import { useQuerySignals } from '../../../../containers/detection_engine/signals/use_query';
 import { MatrixLoader } from '../../../../components/matrix_histogram/matrix_loader';
 
-import { formatSignalsData, getSignalsHistogramQuery } from './helpers';
+import { formatSignalsData, getSignalsHistogramQuery, showInitialLoadingSpinner } from './helpers';
 import * as i18n from './translations';
 
 const DEFAULT_PANEL_HEIGHT = 300;
@@ -54,7 +54,6 @@ interface SignalsHistogramPanelProps {
   from: number;
   query?: Query;
   legendPosition?: Position;
-  loadingInitial?: boolean;
   panelHeight?: number;
   signalIndexName: string | null;
   setQuery: (params: RegisterQuery) => void;
@@ -75,7 +74,6 @@ export const SignalsHistogramPanel = memo<SignalsHistogramPanelProps>(
     query,
     from,
     legendPosition = 'right',
-    loadingInitial = false,
     panelHeight = DEFAULT_PANEL_HEIGHT,
     setQuery,
     signalIndexName,
@@ -86,7 +84,7 @@ export const SignalsHistogramPanel = memo<SignalsHistogramPanelProps>(
     title = i18n.HISTOGRAM_HEADER,
     updateDateRange,
   }) => {
-    const [isInitialLoading, setIsInitialLoading] = useState(loadingInitial || true);
+    const [isInitialLoading, setIsInitialLoading] = useState(true);
     const [defaultNumberFormat] = useUiSetting$<string>(DEFAULT_NUMBER_FORMAT);
     const [totalSignalsObj, setTotalSignalsObj] = useState<SignalsTotal>(defaultTotalSignalsObj);
     const [selectedStackByOption, setSelectedStackByOption] = useState<SignalsHistogramOption>(
@@ -124,10 +122,16 @@ export const SignalsHistogramPanel = memo<SignalsHistogramPanelProps>(
     const formattedSignalsData = useMemo(() => formatSignalsData(signalsData), [signalsData]);
 
     useEffect(() => {
-      if (!loadingInitial && isInitialLoading && !isLoadingSignals && signalsData) {
+      let canceled = false;
+
+      if (!canceled && !showInitialLoadingSpinner({ isInitialLoading, isLoadingSignals })) {
         setIsInitialLoading(false);
       }
-    }, [loadingInitial, isLoadingSignals, signalsData]);
+
+      return () => {
+        canceled = true; // prevent long running data fetches from updating state after unmounting
+      };
+    }, [isInitialLoading, isLoadingSignals, setIsInitialLoading]);
 
     useEffect(() => {
       return () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
index d854c377e6ec8..ff6722840fd6b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
@@ -177,7 +177,6 @@ const DetectionEnginePageComponent: React.FC<DetectionEnginePageComponentProps>
                             deleteQuery={deleteQuery}
                             filters={filters}
                             from={from}
-                            loadingInitial={loading}
                             query={query}
                             setQuery={setQuery}
                             showTotalSignalsCount={true}

From 2b26a3950b8280711a711efa1b0ee340873d9ebb Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Tue, 4 Feb 2020 18:07:23 -0600
Subject: [PATCH 5/8] =?UTF-8?q?Advanced=20settings=20component=20registry?=
 =?UTF-8?q?=20=E2=87=92=20kibana=20platform=20plugin=20(#55940)=20(#56808)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* advanced settings component registry to new platform
---
 .i18nrc.json                                  |  1 +
 .../advanced_settings.test.tsx.snap           | 12 +--
 .../settings/advanced_settings.test.tsx       | 18 ++++
 .../sections/settings/advanced_settings.tsx   | 19 ++--
 .../component_registry.test.tsx.snap          |  5 -
 .../components/component_registry.test.tsx    | 82 -----------------
 .../settings/components/component_registry.ts | 83 -----------------
 .../default_component_registry.test.tsx       | 44 ---------
 .../public/views/management/management.js     |  9 +-
 src/legacy/ui/public/management/index.d.ts    |  8 --
 src/legacy/ui/public/management/index.js      |  6 --
 .../public/new_platform/__mocks__/helpers.ts  |  3 +
 .../new_platform/new_platform.karma_mock.js   |  7 ++
 .../ui/public/new_platform/new_platform.ts    |  6 ++
 src/plugins/advanced_settings/kibana.json     |  7 ++
 .../component_registry.test.tsx.snap          |  3 +
 .../component_registry.test.tsx               | 90 ++++++++++++++++++
 .../component_registry/component_registry.ts  | 91 +++++++++++++++++++
 .../public/component_registry/index.ts        | 20 ++++
 .../__snapshots__/page_footer.test.tsx.snap   |  0
 .../component_registry}/page_footer/index.ts  |  0
 .../page_footer/page_footer.test.tsx          |  0
 .../page_footer/page_footer.ts                |  0
 .../__snapshots__/page_subtitle.test.tsx.snap |  0
 .../page_subtitle/index.ts                    |  0
 .../page_subtitle/page_subtitle.test.tsx      |  0
 .../page_subtitle/page_subtitle.ts            |  0
 .../__snapshots__/page_title.test.tsx.snap    |  2 +-
 .../component_registry}/page_title/index.ts   |  0
 .../page_title/page_title.test.tsx            |  0
 .../page_title/page_title.tsx                 |  2 +-
 src/plugins/advanced_settings/public/index.ts | 27 ++++++
 src/plugins/advanced_settings/public/mocks.ts | 33 +++++++
 .../advanced_settings/public/plugin.ts}       | 28 +++---
 src/plugins/advanced_settings/public/types.ts | 27 ++++++
 .../advanced_settings_service.test.tsx        | 21 ++---
 .../advanced_settings_service.tsx             | 22 +++--
 x-pack/legacy/plugins/spaces/public/legacy.ts |  5 +-
 .../legacy/plugins/spaces/public/plugin.tsx   | 11 +--
 .../translations/translations/ja-JP.json      |  2 +-
 .../translations/translations/zh-CN.json      |  2 +-
 41 files changed, 399 insertions(+), 297 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/settings/components/__snapshots__/component_registry.test.tsx.snap
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.test.tsx
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.ts
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.test.tsx
 create mode 100644 src/plugins/advanced_settings/kibana.json
 create mode 100644 src/plugins/advanced_settings/public/component_registry/__snapshots__/component_registry.test.tsx.snap
 create mode 100644 src/plugins/advanced_settings/public/component_registry/component_registry.test.tsx
 create mode 100644 src/plugins/advanced_settings/public/component_registry/component_registry.ts
 create mode 100644 src/plugins/advanced_settings/public/component_registry/index.ts
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_footer/__snapshots__/page_footer.test.tsx.snap (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_footer/index.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_footer/page_footer.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_footer/page_footer.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_subtitle/__snapshots__/page_subtitle.test.tsx.snap (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_subtitle/index.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_subtitle/page_subtitle.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_subtitle/page_subtitle.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_title/__snapshots__/page_title.test.tsx.snap (85%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_title/index.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_title/page_title.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components => plugins/advanced_settings/public/component_registry}/page_title/page_title.tsx (91%)
 create mode 100644 src/plugins/advanced_settings/public/index.ts
 create mode 100644 src/plugins/advanced_settings/public/mocks.ts
 rename src/{legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.ts => plugins/advanced_settings/public/plugin.ts} (54%)
 create mode 100644 src/plugins/advanced_settings/public/types.ts

diff --git a/.i18nrc.json b/.i18nrc.json
index 7d7685b5c1ef1..e0acda70cc348 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -26,6 +26,7 @@
       "src/legacy/core_plugins/management",
       "src/plugins/management"
     ],
+    "advancedSettings": "src/plugins/advanced_settings",
     "kibana_react": "src/legacy/core_plugins/kibana_react",
     "kibana-react": "src/plugins/kibana_react",
     "kibana_utils": "src/plugins/kibana_utils",
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.tsx.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.tsx.snap
index 4814432c832e2..e76435fdb73b2 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.tsx.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`AdvancedSettings should render read-only when saving is disabled 1`] =
     gutterSize="none"
   >
     <EuiFlexItem>
-      <advanced_settings_page_title />
+      <foo_component />
     </EuiFlexItem>
     <EuiFlexItem>
       <Search
@@ -57,7 +57,7 @@ exports[`AdvancedSettings should render read-only when saving is disabled 1`] =
       />
     </EuiFlexItem>
   </EuiFlexGroup>
-  <advanced_settings_page_subtitle />
+  <foo_component />
   <EuiSpacer
     size="m"
   />
@@ -139,7 +139,7 @@ exports[`AdvancedSettings should render read-only when saving is disabled 1`] =
     }
     showNoResultsMessage={true}
   />
-  <advanced_settings_page_footer
+  <foo_component
     enableSaving={false}
     onQueryMatchChange={[Function]}
     query={
@@ -189,7 +189,7 @@ exports[`AdvancedSettings should render specific setting if given setting key 1`
     gutterSize="none"
   >
     <EuiFlexItem>
-      <advanced_settings_page_title />
+      <foo_component />
     </EuiFlexItem>
     <EuiFlexItem>
       <Search
@@ -240,7 +240,7 @@ exports[`AdvancedSettings should render specific setting if given setting key 1`
       />
     </EuiFlexItem>
   </EuiFlexGroup>
-  <advanced_settings_page_subtitle />
+  <foo_component />
   <EuiSpacer
     size="m"
   />
@@ -322,7 +322,7 @@ exports[`AdvancedSettings should render specific setting if given setting key 1`
     }
     showNoResultsMessage={true}
   />
-  <advanced_settings_page_footer
+  <foo_component
     enableSaving={true}
     onQueryMatchChange={[Function]}
     query={
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.tsx b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.tsx
index 2a75c98b721bc..00b587c2e0fb5 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.tsx
@@ -27,7 +27,9 @@ import {
   UiSettingsType,
 } from '../../../../../../../core/public';
 import { FieldSetting } from './types';
+
 import { AdvancedSettings } from './advanced_settings';
+jest.mock('ui/new_platform');
 
 jest.mock('ui/new_platform', () => ({
   npStart: mockConfig(),
@@ -215,6 +217,22 @@ function mockConfig() {
     core: {
       uiSettings: config,
     },
+    plugins: {
+      advancedSettings: {
+        component: {
+          register: jest.fn(),
+          get: () => {
+            const foo: React.ComponentType = () => <div>Hello</div>;
+            foo.displayName = 'foo_component';
+            return foo;
+          },
+          componentType: {
+            PAGE_TITLE_COMPONENT: 'page_title_component',
+            PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
+          },
+        },
+      },
+    },
   };
 }
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.tsx b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.tsx
index 569ef73f2b453..c995b391d3d2d 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.tsx
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.tsx
@@ -31,14 +31,6 @@ import { getAriaName, toEditableConfig, DEFAULT_CATEGORY } from './lib';
 
 import { FieldSetting, IQuery } from './types';
 
-import {
-  registerDefaultComponents,
-  PAGE_TITLE_COMPONENT,
-  PAGE_SUBTITLE_COMPONENT,
-  PAGE_FOOTER_COMPONENT,
-} from './components/default_component_registry';
-import { getSettingsComponent } from './components/component_registry';
-
 interface AdvancedSettingsProps {
   queryText: string;
   enableSaving: boolean;
@@ -75,8 +67,6 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
       footerQueryMatched: false,
       filteredSettings: this.mapSettings(Query.execute(parsedQuery, this.settings)),
     };
-
-    registerDefaultComponents();
   }
 
   init(config: IUiSettingsClient) {
@@ -166,10 +156,13 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
 
   render() {
     const { filteredSettings, query, footerQueryMatched } = this.state;
+    const componentRegistry = npStart.plugins.advancedSettings.component;
 
-    const PageTitle = getSettingsComponent(PAGE_TITLE_COMPONENT);
-    const PageSubtitle = getSettingsComponent(PAGE_SUBTITLE_COMPONENT);
-    const PageFooter = getSettingsComponent(PAGE_FOOTER_COMPONENT);
+    const PageTitle = componentRegistry.get(componentRegistry.componentType.PAGE_TITLE_COMPONENT);
+    const PageSubtitle = componentRegistry.get(
+      componentRegistry.componentType.PAGE_SUBTITLE_COMPONENT
+    );
+    const PageFooter = componentRegistry.get(componentRegistry.componentType.PAGE_FOOTER_COMPONENT);
 
     return (
       <div>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/__snapshots__/component_registry.test.tsx.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/__snapshots__/component_registry.test.tsx.snap
deleted file mode 100644
index 070b387057061..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/__snapshots__/component_registry.test.tsx.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`getSettingsComponent should throw an error when requesting a component that does not exist 1`] = `"Component not found with id does not exist"`;
-
-exports[`registerSettingsComponent should disallow registering a component with a duplicate id 1`] = `"Component with id test2 is already registered."`;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.test.tsx b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.test.tsx
deleted file mode 100644
index 24e9e5dd3809c..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.test.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React, { FunctionComponent } from 'react';
-import {
-  tryRegisterSettingsComponent,
-  registerSettingsComponent,
-  getSettingsComponent,
-} from './component_registry';
-
-describe('tryRegisterSettingsComponent', () => {
-  it('should allow a component to be registered', () => {
-    const component = () => <div />;
-    expect(tryRegisterSettingsComponent('tryTest1', component)).toEqual(true);
-  });
-
-  it('should return false if the component is already registered, and not allow an override', () => {
-    const component = () => <div />;
-    expect(tryRegisterSettingsComponent('tryTest2', component)).toEqual(true);
-
-    const updatedComponent = () => <div />;
-    expect(tryRegisterSettingsComponent('tryTest2', updatedComponent)).toEqual(false);
-    expect(getSettingsComponent('tryTest2')).toBe(component);
-  });
-});
-
-describe('registerSettingsComponent', () => {
-  it('should allow a component to be registered', () => {
-    const component = () => <div />;
-    registerSettingsComponent('test', component);
-  });
-
-  it('should disallow registering a component with a duplicate id', () => {
-    const component = () => <div />;
-    registerSettingsComponent('test2', component);
-    expect(() => registerSettingsComponent('test2', () => <span />)).toThrowErrorMatchingSnapshot();
-  });
-
-  it('should allow a component to be overriden', () => {
-    const component = () => <div />;
-    registerSettingsComponent('test3', component);
-
-    const anotherComponent = () => <span />;
-    registerSettingsComponent('test3', anotherComponent, true);
-
-    expect(getSettingsComponent('test3')).toBe(anotherComponent);
-  });
-
-  it('should set a displayName for the component', () => {
-    const component = () => <div />;
-    registerSettingsComponent('display_name_component', component);
-    expect((component as FunctionComponent).displayName).toEqual('display_name_component');
-  });
-});
-
-describe('getSettingsComponent', () => {
-  it('should allow a component to be retrieved', () => {
-    const component = () => <div />;
-    registerSettingsComponent('test4', component);
-    expect(getSettingsComponent('test4')).toBe(component);
-  });
-
-  it('should throw an error when requesting a component that does not exist', () => {
-    expect(() => getSettingsComponent('does not exist')).toThrowErrorMatchingSnapshot();
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.ts b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.ts
deleted file mode 100644
index b58180c498edf..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { ComponentType } from 'react';
-
-type Id = string;
-const registry: Record<Id, ComponentType<Record<string, any> | undefined>> = {};
-
-/**
- * Attempts to register the provided component.
- * If a component with that ID is already registered, then the registration fails.
- *
- * @param {*} id the id of the component to register
- * @param {*} component the component
- */
-export function tryRegisterSettingsComponent(
-  id: Id,
-  component: ComponentType<Record<string, any> | undefined>
-) {
-  if (id in registry) {
-    return false;
-  }
-
-  registerSettingsComponent(id, component);
-  return true;
-}
-
-/**
- * Attempts to register the provided component, with the ability to optionally allow
- * the component to override an existing one.
- *
- * If the intent is to override, then `allowOverride` must be set to true, otherwise an exception is thrown.
- *
- * @param {*} id the id of the component to register
- * @param {*} component the component
- * @param {*} allowOverride (default: false) - optional flag to allow this component to override a previously registered component
- */
-export function registerSettingsComponent(
-  id: Id,
-  component: ComponentType<Record<string, any> | undefined>,
-  allowOverride = false
-) {
-  if (!allowOverride && id in registry) {
-    throw new Error(`Component with id ${id} is already registered.`);
-  }
-
-  // Setting a display name if one does not already exist.
-  // This enhances the snapshots, as well as the debugging experience.
-  if (!component.displayName) {
-    component.displayName = id;
-  }
-
-  registry[id] = component;
-}
-
-/**
- * Retrieve a registered component by its ID.
- * If the component does not exist, then an exception is thrown.
- *
- * @param {*} id the ID of the component to retrieve
- */
-export function getSettingsComponent(id: Id): ComponentType<Record<string, any> | undefined> {
-  if (!(id in registry)) {
-    throw new Error(`Component not found with id ${id}`);
-  }
-  return registry[id];
-}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.test.tsx b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.test.tsx
deleted file mode 100644
index ff3f75b79baef..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.test.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { registerDefaultComponents, PAGE_TITLE_COMPONENT } from './default_component_registry';
-import { getSettingsComponent, registerSettingsComponent } from './component_registry';
-import { PageTitle } from './page_title';
-
-describe('default_component_registry', () => {
-  it('should register default components with the registry', () => {
-    registerDefaultComponents();
-    expect(getSettingsComponent(PAGE_TITLE_COMPONENT)).toEqual(PageTitle);
-  });
-
-  it('should be able to call "registerDefaultComponents" several times without throwing', () => {
-    registerDefaultComponents();
-    registerDefaultComponents();
-    registerDefaultComponents();
-  });
-
-  it('should not override components if they are already registered', () => {
-    const newComponent = () => <div />;
-    registerSettingsComponent(PAGE_TITLE_COMPONENT, newComponent, true);
-    registerDefaultComponents();
-
-    expect(getSettingsComponent(PAGE_TITLE_COMPONENT)).toEqual(newComponent);
-  });
-});
diff --git a/src/legacy/core_plugins/telemetry/public/views/management/management.js b/src/legacy/core_plugins/telemetry/public/views/management/management.js
index 796caf1c8cfe6..7032775e391bb 100644
--- a/src/legacy/core_plugins/telemetry/public/views/management/management.js
+++ b/src/legacy/core_plugins/telemetry/public/views/management/management.js
@@ -19,7 +19,7 @@
 import React from 'react';
 import routes from 'ui/routes';
 
-import { registerSettingsComponent, PAGE_FOOTER_COMPONENT } from 'ui/management';
+import { npSetup } from 'ui/new_platform';
 import { TelemetryOptInProvider } from '../../services';
 import { TelemetryForm } from '../../components';
 
@@ -27,6 +27,7 @@ routes.defaults(/\/management/, {
   resolve: {
     telemetryManagementSection: function(Private) {
       const telemetryOptInProvider = Private(TelemetryOptInProvider);
+      const componentRegistry = npSetup.plugins.advancedSettings.component;
 
       const Component = props => (
         <TelemetryForm
@@ -36,7 +37,11 @@ routes.defaults(/\/management/, {
         />
       );
 
-      registerSettingsComponent(PAGE_FOOTER_COMPONENT, Component, true);
+      componentRegistry.register(
+        componentRegistry.componentType.PAGE_FOOTER_COMPONENT,
+        Component,
+        true
+      );
     },
   },
 });
diff --git a/src/legacy/ui/public/management/index.d.ts b/src/legacy/ui/public/management/index.d.ts
index 7880e1d5d0295..529efd36623a3 100644
--- a/src/legacy/ui/public/management/index.d.ts
+++ b/src/legacy/ui/public/management/index.d.ts
@@ -18,15 +18,7 @@
  */
 
 declare module 'ui/management' {
-  export const PAGE_TITLE_COMPONENT: string;
-  export const PAGE_SUBTITLE_COMPONENT: string;
-  export const PAGE_FOOTER_COMPONENT: string;
   export const SidebarNav: React.FC<any>;
-  export function registerSettingsComponent(
-    id: string,
-    component: string | React.FC<any>,
-    allowOverride: boolean
-  ): void;
   export const management: any; // TODO - properly provide types
   export const MANAGEMENT_BREADCRUMB: {
     text: string;
diff --git a/src/legacy/ui/public/management/index.js b/src/legacy/ui/public/management/index.js
index b2f1946dbc59c..25d3678c5dbba 100644
--- a/src/legacy/ui/public/management/index.js
+++ b/src/legacy/ui/public/management/index.js
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-export {
-  PAGE_TITLE_COMPONENT,
-  PAGE_SUBTITLE_COMPONENT,
-  PAGE_FOOTER_COMPONENT,
-} from '../../../core_plugins/kibana/public/management/sections/settings/components/default_component_registry';
-export { registerSettingsComponent } from '../../../core_plugins/kibana/public/management/sections/settings/components/component_registry';
 export { MANAGEMENT_BREADCRUMB } from './breadcrumbs';
 import { npStart } from 'ui/new_platform';
 export const management = npStart.plugins.management.legacy;
diff --git a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts b/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
index 439ac9b5713df..cf24b0e9675fa 100644
--- a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
+++ b/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
@@ -29,6 +29,7 @@ import { managementPluginMock } from '../../../../../plugins/management/public/m
 import { usageCollectionPluginMock } from '../../../../../plugins/usage_collection/public/mocks';
 import { kibanaLegacyPluginMock } from '../../../../../plugins/kibana_legacy/public/mocks';
 import { chartPluginMock } from '../../../../../plugins/charts/public/mocks';
+import { advancedSettingsMock } from '../../../../../plugins/advanced_settings/public/mocks';
 /* eslint-enable @kbn/eslint/no-restricted-paths */
 
 export const pluginsMock = {
@@ -41,6 +42,7 @@ export const pluginsMock = {
     expressions: expressionsPluginMock.createSetupContract(),
     uiActions: uiActionsPluginMock.createSetupContract(),
     usageCollection: usageCollectionPluginMock.createSetupContract(),
+    advancedSettings: advancedSettingsMock.createSetupContract(),
     kibana_legacy: kibanaLegacyPluginMock.createSetupContract(),
   }),
   createStart: () => ({
@@ -52,6 +54,7 @@ export const pluginsMock = {
     expressions: expressionsPluginMock.createStartContract(),
     uiActions: uiActionsPluginMock.createStartContract(),
     management: managementPluginMock.createStartContract(),
+    advancedSettings: advancedSettingsMock.createStartContract(),
     kibana_legacy: kibanaLegacyPluginMock.createStartContract(),
   }),
 };
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index c2c8b5a0fae7a..7f4f67ebb06d3 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -20,6 +20,7 @@
 import sinon from 'sinon';
 import { getFieldFormatsRegistry } from '../../../../test_utils/public/stub_field_formats';
 import { METRIC_TYPE } from '@kbn/analytics';
+import { ComponentRegistry } from '../../../../../src/plugins/advanced_settings/public/';
 
 const mockObservable = () => {
   return {
@@ -58,6 +59,12 @@ const mockCore = {
 export const npSetup = {
   core: mockCore,
   plugins: {
+    advancedSettings: {
+      component: {
+        register: sinon.fake(),
+        componentType: ComponentRegistry.componentType,
+      },
+    },
     usageCollection: {
       allowTrackUserAgent: sinon.fake(),
       reportUiStats: sinon.fake(),
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index 2ade98ec54efd..62abe2eb9b5ba 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -32,6 +32,10 @@ import { DevToolsSetup, DevToolsStart } from '../../../../plugins/dev_tools/publ
 import { KibanaLegacySetup, KibanaLegacyStart } from '../../../../plugins/kibana_legacy/public';
 import { HomePublicPluginSetup, HomePublicPluginStart } from '../../../../plugins/home/public';
 import { SharePluginSetup, SharePluginStart } from '../../../../plugins/share/public';
+import {
+  AdvancedSettingsSetup,
+  AdvancedSettingsStart,
+} from '../../../../plugins/advanced_settings/public';
 import { ManagementSetup, ManagementStart } from '../../../../plugins/management/public';
 import { BfetchPublicSetup, BfetchPublicStart } from '../../../../plugins/bfetch/public';
 import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
@@ -54,6 +58,7 @@ export interface PluginsSetup {
   kibana_legacy: KibanaLegacySetup;
   share: SharePluginSetup;
   usageCollection: UsageCollectionSetup;
+  advancedSettings: AdvancedSettingsSetup;
   management: ManagementSetup;
 }
 
@@ -71,6 +76,7 @@ export interface PluginsStart {
   kibana_legacy: KibanaLegacyStart;
   share: SharePluginStart;
   management: ManagementStart;
+  advancedSettings: AdvancedSettingsStart;
 }
 
 export const npSetup = {
diff --git a/src/plugins/advanced_settings/kibana.json b/src/plugins/advanced_settings/kibana.json
new file mode 100644
index 0000000000000..5fc1e916ae45f
--- /dev/null
+++ b/src/plugins/advanced_settings/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "advancedSettings",
+  "version": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": []
+}
diff --git a/src/plugins/advanced_settings/public/component_registry/__snapshots__/component_registry.test.tsx.snap b/src/plugins/advanced_settings/public/component_registry/__snapshots__/component_registry.test.tsx.snap
new file mode 100644
index 0000000000000..1d6cc882cb344
--- /dev/null
+++ b/src/plugins/advanced_settings/public/component_registry/__snapshots__/component_registry.test.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ComponentRegistry register should disallow registering a component with a duplicate id 1`] = `"Component with id advanced_settings_page_title is already registered."`;
diff --git a/src/plugins/advanced_settings/public/component_registry/component_registry.test.tsx b/src/plugins/advanced_settings/public/component_registry/component_registry.test.tsx
new file mode 100644
index 0000000000000..3b722e9517fdb
--- /dev/null
+++ b/src/plugins/advanced_settings/public/component_registry/component_registry.test.tsx
@@ -0,0 +1,90 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { ComponentRegistry } from './component_registry';
+
+describe('ComponentRegistry', () => {
+  describe('register', () => {
+    it('should allow a component to be registered', () => {
+      const component = () => <div />;
+      new ComponentRegistry().setup.register(
+        ComponentRegistry.componentType.PAGE_TITLE_COMPONENT,
+        component
+      );
+    });
+
+    it('should disallow registering a component with a duplicate id', () => {
+      const registry = new ComponentRegistry();
+      const component = () => <div />;
+      registry.setup.register(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT, component);
+      expect(() =>
+        registry.setup.register(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT, () => (
+          <span />
+        ))
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    it('should allow a component to be overriden', () => {
+      const registry = new ComponentRegistry();
+      const component = () => <div />;
+      registry.setup.register(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT, component);
+
+      const anotherComponent = () => <span />;
+      registry.setup.register(
+        ComponentRegistry.componentType.PAGE_TITLE_COMPONENT,
+        anotherComponent,
+        true
+      );
+
+      expect(registry.start.get(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT)).toBe(
+        anotherComponent
+      );
+    });
+  });
+
+  describe('get', () => {
+    it('should allow a component to be retrieved', () => {
+      const registry = new ComponentRegistry();
+      const component = () => <div />;
+      registry.setup.register(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT, component);
+      expect(registry.start.get(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT)).toBe(
+        component
+      );
+    });
+  });
+
+  it('should set a displayName for the component if one does not exist', () => {
+    const component: React.ComponentType = () => <div />;
+    const registry = new ComponentRegistry();
+    registry.setup.register(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT, component);
+
+    expect(component.displayName).toEqual(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT);
+  });
+
+  it('should not set a displayName for the component if one already exists', () => {
+    const component: React.ComponentType = () => <div />;
+    component.displayName = '<AwesomeComponent>';
+    const registry = new ComponentRegistry();
+
+    registry.setup.register(ComponentRegistry.componentType.PAGE_TITLE_COMPONENT, component);
+
+    expect(component.displayName).toEqual('<AwesomeComponent>');
+  });
+});
diff --git a/src/plugins/advanced_settings/public/component_registry/component_registry.ts b/src/plugins/advanced_settings/public/component_registry/component_registry.ts
new file mode 100644
index 0000000000000..cc61798e84cb7
--- /dev/null
+++ b/src/plugins/advanced_settings/public/component_registry/component_registry.ts
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ComponentType } from 'react';
+import { PageTitle } from './page_title';
+import { PageSubtitle } from './page_subtitle';
+import { PageFooter } from './page_footer';
+
+type Id =
+  | 'advanced_settings_page_title'
+  | 'advanced_settings_page_subtitle'
+  | 'advanced_settings_page_footer';
+
+const componentType: { [key: string]: Id } = {
+  PAGE_TITLE_COMPONENT: 'advanced_settings_page_title' as Id,
+  PAGE_SUBTITLE_COMPONENT: 'advanced_settings_page_subtitle' as Id,
+  PAGE_FOOTER_COMPONENT: 'advanced_settings_page_footer' as Id,
+};
+
+type RegistryComponent = ComponentType<Record<string, any> | undefined>;
+
+export class ComponentRegistry {
+  static readonly componentType = componentType;
+  static readonly defaultRegistry: Record<Id, RegistryComponent> = {
+    advanced_settings_page_title: PageTitle,
+    advanced_settings_page_subtitle: PageSubtitle,
+    advanced_settings_page_footer: PageFooter,
+  };
+
+  registry: { [key in Id]?: RegistryComponent } = {};
+
+  /**
+   * Attempts to register the provided component, with the ability to optionally allow
+   * the component to override an existing one.
+   *
+   * If the intent is to override, then `allowOverride` must be set to true, otherwise an exception is thrown.
+   *
+   * @param {*} id the id of the component to register
+   * @param {*} component the component
+   * @param {*} allowOverride (default: false) - optional flag to allow this component to override a previously registered component
+   */
+  private register(id: Id, component: RegistryComponent, allowOverride = false) {
+    if (!allowOverride && id in this.registry) {
+      throw new Error(`Component with id ${id} is already registered.`);
+    }
+
+    // Setting a display name if one does not already exist.
+    // This enhances the snapshots, as well as the debugging experience.
+    if (!component.displayName) {
+      component.displayName = id;
+    }
+
+    this.registry[id] = component;
+  }
+
+  /**
+   * Retrieve a registered component by its ID.
+   * If the component does not exist, then an exception is thrown.
+   *
+   * @param {*} id the ID of the component to retrieve
+   */
+  private get(id: Id): RegistryComponent {
+    return this.registry[id] || ComponentRegistry.defaultRegistry[id];
+  }
+
+  setup = {
+    componentType: ComponentRegistry.componentType,
+    register: this.register.bind(this),
+  };
+
+  start = {
+    componentType: ComponentRegistry.componentType,
+    get: this.get.bind(this),
+  };
+}
diff --git a/src/plugins/advanced_settings/public/component_registry/index.ts b/src/plugins/advanced_settings/public/component_registry/index.ts
new file mode 100644
index 0000000000000..79c9248e0c2a9
--- /dev/null
+++ b/src/plugins/advanced_settings/public/component_registry/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { ComponentRegistry } from './component_registry';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/__snapshots__/page_footer.test.tsx.snap b/src/plugins/advanced_settings/public/component_registry/page_footer/__snapshots__/page_footer.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/__snapshots__/page_footer.test.tsx.snap
rename to src/plugins/advanced_settings/public/component_registry/page_footer/__snapshots__/page_footer.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/index.ts b/src/plugins/advanced_settings/public/component_registry/page_footer/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/index.ts
rename to src/plugins/advanced_settings/public/component_registry/page_footer/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/page_footer.test.tsx b/src/plugins/advanced_settings/public/component_registry/page_footer/page_footer.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/page_footer.test.tsx
rename to src/plugins/advanced_settings/public/component_registry/page_footer/page_footer.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/page_footer.ts b/src/plugins/advanced_settings/public/component_registry/page_footer/page_footer.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_footer/page_footer.ts
rename to src/plugins/advanced_settings/public/component_registry/page_footer/page_footer.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/__snapshots__/page_subtitle.test.tsx.snap b/src/plugins/advanced_settings/public/component_registry/page_subtitle/__snapshots__/page_subtitle.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/__snapshots__/page_subtitle.test.tsx.snap
rename to src/plugins/advanced_settings/public/component_registry/page_subtitle/__snapshots__/page_subtitle.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/index.ts b/src/plugins/advanced_settings/public/component_registry/page_subtitle/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/index.ts
rename to src/plugins/advanced_settings/public/component_registry/page_subtitle/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.test.tsx b/src/plugins/advanced_settings/public/component_registry/page_subtitle/page_subtitle.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.test.tsx
rename to src/plugins/advanced_settings/public/component_registry/page_subtitle/page_subtitle.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.ts b/src/plugins/advanced_settings/public/component_registry/page_subtitle/page_subtitle.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.ts
rename to src/plugins/advanced_settings/public/component_registry/page_subtitle/page_subtitle.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/__snapshots__/page_title.test.tsx.snap b/src/plugins/advanced_settings/public/component_registry/page_title/__snapshots__/page_title.test.tsx.snap
similarity index 85%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/__snapshots__/page_title.test.tsx.snap
rename to src/plugins/advanced_settings/public/component_registry/page_title/__snapshots__/page_title.test.tsx.snap
index 8dd4e501067b5..10b799a986b84 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/__snapshots__/page_title.test.tsx.snap
+++ b/src/plugins/advanced_settings/public/component_registry/page_title/__snapshots__/page_title.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`PageTitle should render normally 1`] = `
   >
     <FormattedMessage
       defaultMessage="Settings"
-      id="kbn.management.settings.pageTitle"
+      id="advancedSettings.pageTitle"
       values={Object {}}
     />
   </h1>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/index.ts b/src/plugins/advanced_settings/public/component_registry/page_title/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/index.ts
rename to src/plugins/advanced_settings/public/component_registry/page_title/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.test.tsx b/src/plugins/advanced_settings/public/component_registry/page_title/page_title.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.test.tsx
rename to src/plugins/advanced_settings/public/component_registry/page_title/page_title.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.tsx b/src/plugins/advanced_settings/public/component_registry/page_title/page_title.tsx
similarity index 91%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.tsx
rename to src/plugins/advanced_settings/public/component_registry/page_title/page_title.tsx
index cb807302c2380..18d9c60d331bb 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.tsx
+++ b/src/plugins/advanced_settings/public/component_registry/page_title/page_title.tsx
@@ -25,7 +25,7 @@ export const PageTitle = () => {
   return (
     <EuiText>
       <h1 data-test-subj="managementSettingsTitle">
-        <FormattedMessage id="kbn.management.settings.pageTitle" defaultMessage="Settings" />
+        <FormattedMessage id="advancedSettings.pageTitle" defaultMessage="Settings" />
       </h1>
     </EuiText>
   );
diff --git a/src/plugins/advanced_settings/public/index.ts b/src/plugins/advanced_settings/public/index.ts
new file mode 100644
index 0000000000000..13be36e671f75
--- /dev/null
+++ b/src/plugins/advanced_settings/public/index.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'kibana/public';
+import { AdvancedSettingsPlugin } from './plugin';
+export { AdvancedSettingsSetup, AdvancedSettingsStart } from './types';
+export { ComponentRegistry } from './component_registry';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new AdvancedSettingsPlugin();
+}
diff --git a/src/plugins/advanced_settings/public/mocks.ts b/src/plugins/advanced_settings/public/mocks.ts
new file mode 100644
index 0000000000000..e147f57101aae
--- /dev/null
+++ b/src/plugins/advanced_settings/public/mocks.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ComponentRegistry } from './component_registry';
+
+const register = jest.fn();
+const get = jest.fn();
+const componentType = ComponentRegistry.componentType;
+
+export const advancedSettingsMock = {
+  createSetupContract() {
+    return { register, componentType };
+  },
+  createStartContract() {
+    return { get, componentType };
+  },
+};
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.ts b/src/plugins/advanced_settings/public/plugin.ts
similarity index 54%
rename from src/legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.ts
rename to src/plugins/advanced_settings/public/plugin.ts
index 80b2f2e79b9c7..692e515ca4e5e 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.ts
+++ b/src/plugins/advanced_settings/public/plugin.ts
@@ -17,17 +17,23 @@
  * under the License.
  */
 
-import { tryRegisterSettingsComponent } from './component_registry';
-import { PageTitle } from './page_title';
-import { PageSubtitle } from './page_subtitle';
-import { PageFooter } from './page_footer';
+import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { ComponentRegistry } from './component_registry';
+import { AdvancedSettingsSetup, AdvancedSettingsStart } from './types';
 
-export const PAGE_TITLE_COMPONENT = 'advanced_settings_page_title';
-export const PAGE_SUBTITLE_COMPONENT = 'advanced_settings_page_subtitle';
-export const PAGE_FOOTER_COMPONENT = 'advanced_settings_page_footer';
+const component = new ComponentRegistry();
 
-export function registerDefaultComponents() {
-  tryRegisterSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle);
-  tryRegisterSettingsComponent(PAGE_SUBTITLE_COMPONENT, PageSubtitle);
-  tryRegisterSettingsComponent(PAGE_FOOTER_COMPONENT, PageFooter);
+export class AdvancedSettingsPlugin
+  implements Plugin<AdvancedSettingsSetup, AdvancedSettingsStart> {
+  public setup(core: CoreSetup) {
+    return {
+      component: component.setup,
+    };
+  }
+
+  public start(core: CoreStart) {
+    return {
+      component: component.start,
+    };
+  }
 }
diff --git a/src/plugins/advanced_settings/public/types.ts b/src/plugins/advanced_settings/public/types.ts
new file mode 100644
index 0000000000000..a9b965c3c22de
--- /dev/null
+++ b/src/plugins/advanced_settings/public/types.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ComponentRegistry } from './component_registry';
+
+export interface AdvancedSettingsSetup {
+  component: ComponentRegistry['setup'];
+}
+export interface AdvancedSettingsStart {
+  component: ComponentRegistry['start'];
+}
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
index aa3c6acf26236..3c6b2332bbbdc 100644
--- a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
@@ -5,33 +5,30 @@
  */
 
 import { AdvancedSettingsService } from './advanced_settings_service';
-jest.mock('ui/management', () => {
-  return {
-    PAGE_TITLE_COMPONENT: 'page_title_component',
-    PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
-  };
-});
+import { advancedSettingsMock } from '../../../../../../src/plugins/advanced_settings/public/mocks';
+
+const componentRegistryMock = advancedSettingsMock.createSetupContract();
 
 describe('Advanced Settings Service', () => {
   describe('#setup', () => {
     it('registers space-aware components to augment the advanced settings screen', () => {
       const deps = {
         getActiveSpace: jest.fn().mockResolvedValue({ id: 'foo', name: 'foo-space' }),
-        registerSettingsComponent: jest.fn(),
+        componentRegistry: componentRegistryMock,
       };
 
       const advancedSettingsService = new AdvancedSettingsService();
       advancedSettingsService.setup(deps);
 
-      expect(deps.registerSettingsComponent).toHaveBeenCalledTimes(2);
-      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
-        'page_title_component',
+      expect(deps.componentRegistry.register).toHaveBeenCalledTimes(2);
+      expect(deps.componentRegistry.register).toHaveBeenCalledWith(
+        componentRegistryMock.componentType.PAGE_TITLE_COMPONENT,
         expect.any(Function),
         true
       );
 
-      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
-        'page_subtitle_component',
+      expect(deps.componentRegistry.register).toHaveBeenCalledWith(
+        componentRegistryMock.componentType.PAGE_SUBTITLE_COMPONENT,
         expect.any(Function),
         true
       );
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
index 9c6c2fcc2cdda..a1552add18f2d 100644
--- a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
@@ -4,25 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
-import { PAGE_TITLE_COMPONENT, PAGE_SUBTITLE_COMPONENT } from 'ui/management';
 import { Space } from '../../common/model/space';
 import { AdvancedSettingsTitle, AdvancedSettingsSubtitle } from './components';
+import { AdvancedSettingsSetup } from '../../../../../../src/plugins/advanced_settings/public';
 
 interface SetupDeps {
   getActiveSpace: () => Promise<Space>;
-  registerSettingsComponent: (
-    id: string,
-    component: string | React.FC<any>,
-    allowOverride: boolean
-  ) => void;
+  componentRegistry: AdvancedSettingsSetup['component'];
 }
 
 export class AdvancedSettingsService {
-  public setup({ getActiveSpace, registerSettingsComponent }: SetupDeps) {
+  public setup({ getActiveSpace, componentRegistry }: SetupDeps) {
     const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
     const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
 
-    registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
-    registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
+    componentRegistry.register(
+      componentRegistry.componentType.PAGE_TITLE_COMPONENT,
+      PageTitle,
+      true
+    );
+    componentRegistry.register(
+      componentRegistry.componentType.PAGE_SUBTITLE_COMPONENT,
+      SubTitle,
+      true
+    );
   }
 }
diff --git a/x-pack/legacy/plugins/spaces/public/legacy.ts b/x-pack/legacy/plugins/spaces/public/legacy.ts
index 1dffbd2661714..200cae5498595 100644
--- a/x-pack/legacy/plugins/spaces/public/legacy.ts
+++ b/x-pack/legacy/plugins/spaces/public/legacy.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { registerSettingsComponent } from 'ui/management';
 import { npSetup, npStart } from 'ui/new_platform';
 import { setup as managementSetup } from '../../../../../src/legacy/core_plugins/management/public/legacy';
 import { plugin } from '.';
@@ -16,9 +15,7 @@ const spacesPlugin: SpacesPlugin = plugin();
 const pluginsSetup: PluginsSetup = {
   home: npSetup.plugins.home,
   management: managementSetup,
-  __managementLegacyCompat: {
-    registerSettingsComponent,
-  },
+  advancedSettings: npSetup.plugins.advancedSettings,
 };
 
 const pluginsStart: PluginsStart = {
diff --git a/x-pack/legacy/plugins/spaces/public/plugin.tsx b/x-pack/legacy/plugins/spaces/public/plugin.tsx
index 1ddb69a5b595c..e6271ac3a0a70 100644
--- a/x-pack/legacy/plugins/spaces/public/plugin.tsx
+++ b/x-pack/legacy/plugins/spaces/public/plugin.tsx
@@ -8,6 +8,7 @@ import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { HomePublicPluginSetup } from 'src/plugins/home/public';
 import { ManagementSetup } from 'src/legacy/core_plugins/management/public';
 import { ManagementStart } from 'src/plugins/management/public';
+import { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
 import { SpacesManager } from './spaces_manager';
 import { initSpacesNavControl } from './nav_control';
 import { createSpacesFeatureCatalogueEntry } from './create_feature_catalogue_entry';
@@ -22,13 +23,7 @@ export interface SpacesPluginStart {
 export interface PluginsSetup {
   home?: HomePublicPluginSetup;
   management: ManagementSetup;
-  __managementLegacyCompat: {
-    registerSettingsComponent: (
-      id: string,
-      component: string | React.FC<any>,
-      allowOverride: boolean
-    ) => void;
-  };
+  advancedSettings: AdvancedSettingsSetup;
 }
 
 export interface PluginsStart {
@@ -53,7 +48,7 @@ export class SpacesPlugin implements Plugin<void, SpacesPluginStart, PluginsSetu
     const advancedSettingsService = new AdvancedSettingsService();
     advancedSettingsService.setup({
       getActiveSpace: () => this.spacesManager.getActiveSpace(),
-      registerSettingsComponent: plugins.__managementLegacyCompat.registerSettingsComponent,
+      componentRegistry: plugins.advancedSettings.component,
     });
 
     if (plugins.home) {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index a4af12b7af186..e421df2e0ff07 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1925,7 +1925,7 @@
     "kbn.management.settings.form.clearSearchResultText": "(検索結果を消去)",
     "kbn.management.settings.form.noSearchResultText": "設定が見つかりませんでした {clearSearch}",
     "kbn.management.settings.form.searchResultText": "検索用語により {settingsCount} 件の設定が非表示になっています {clearSearch}",
-    "kbn.management.settings.pageTitle": "設定",
+    "advancedSettings.pageTitle": "設定",
     "kbn.management.settings.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
     "kbn.management.settings.searchBarAriaLabel": "高度な設定を検索",
     "kbn.management.settings.sectionLabel": "高度な設定",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 14a27f6098935..12647fb650531 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1925,7 +1925,7 @@
     "kbn.management.settings.form.clearSearchResultText": "（清除搜索）",
     "kbn.management.settings.form.noSearchResultText": "未找到设置{clearSearch}",
     "kbn.management.settings.form.searchResultText": "搜索词隐藏了 {settingsCount} 个设置{clearSearch}",
-    "kbn.management.settings.pageTitle": "设置",
+    "advancedSettings.pageTitle": "设置",
     "kbn.management.settings.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
     "kbn.management.settings.searchBarAriaLabel": "搜索高级设置",
     "kbn.management.settings.sectionLabel": "高级设置",

From e23b5863eafaff93c4a983e8561c38021e96cf7e Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 4 Feb 2020 18:09:01 -0600
Subject: [PATCH 6/8] Prevent http client from converting our form data
 (#56772) (#56792)

If we don't specify an undefined content-type like so, the client
attempts to convert our form data into a JSON string, and the backend
returns an understandable 415.

This fixes rule imports.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/siem/public/containers/detection_engine/rules/api.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
index 4f50a9bd14788..06fb0c6dc3480 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
@@ -246,6 +246,7 @@ export const importRules = async ({
     `${DETECTION_ENGINE_RULES_URL}/_import`,
     {
       method: 'POST',
+      headers: { 'Content-Type': undefined },
       query: { overwrite },
       body: formData,
       asResponse: true,

From 7cfa48949432a76de5c6ded2dd571d476d5dc098 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:44:09 -0500
Subject: [PATCH 7/8] fix open close signal on detail page (#56757) (#56778)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../pages/detection_engine/components/signals/index.tsx     | 4 +++-
 .../detection_engine/routes/__mocks__/request_responses.ts  | 2 +-
 .../routes/signals/open_close_signals_route.ts              | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
index e65adcf3a6920..7eb8e07ada762 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
@@ -129,7 +129,9 @@ const SignalsTableComponent: React.FC<SignalsTableComponentProps> = ({
         dataProviders: [],
         indexPattern: indexPatterns,
         browserFields,
-        filters: globalFilters,
+        filters: isEmpty(defaultFilters)
+          ? globalFilters
+          : [...(defaultFilters ?? []), ...globalFilters],
         kqlQuery: globalQuery,
         kqlMode: globalQuery.language,
         start: from,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 6a42aed123fa3..19c4279e06b03 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -84,7 +84,7 @@ export const typicalSetStatusSignalByIdsPayload = (): Partial<SignalsStatusRestP
 });
 
 export const typicalSetStatusSignalByQueryPayload = (): Partial<SignalsStatusRestParams> => ({
-  query: { range: { '@timestamp': { gte: 'now-2M', lte: 'now/M' } } },
+  query: { bool: { filter: { range: { '@timestamp': { gte: 'now-2M', lte: 'now/M' } } } } },
   status: 'closed',
 });
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/open_close_signals_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
index 7c49a1942ee91..4755869c3d908 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
@@ -33,7 +33,11 @@ export const setSignalsStatusRouteDef = (server: ServerFacade): Hapi.ServerRoute
         queryObject = { ids: { values: signalIds } };
       }
       if (query) {
-        queryObject = query;
+        queryObject = {
+          bool: {
+            filter: query,
+          },
+        };
       }
       try {
         return callWithRequest(request, 'updateByQuery', {

From 1d328a6beaa0bae8baea4c64436727c5e1d90d5f Mon Sep 17 00:00:00 2001
From: Corey Robertson <corey.robertson@elastic.co>
Date: Tue, 4 Feb 2020 19:57:27 -0500
Subject: [PATCH 8/8] [Canvas] Use unique Id for Canvas Embeddables (#56783)
 (#56801)

* Use uniqueID for embeddable registry

* Adds type to renderer
---
 .../renderers/embeddable/embeddable.tsx                | 10 ++++++----
 .../components/element_content/element_content.js      | 10 +++++++++-
 .../public/components/element_wrapper/lib/handlers.js  |  2 ++
 .../shareable_runtime/components/rendered_element.tsx  |  1 +
 x-pack/legacy/plugins/canvas/types/renderers.ts        |  2 ++
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index 8642ebd901bb4..c8cc1fe389619 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -70,7 +70,9 @@ const embeddable = () => ({
     { input, embeddableType }: EmbeddableExpression<EmbeddableInput>,
     handlers: RendererHandlers
   ) => {
-    if (!embeddablesRegistry[input.id]) {
+    const uniqueId = handlers.getElementId();
+
+    if (!embeddablesRegistry[uniqueId]) {
       const factory = Array.from(start.getEmbeddableFactories()).find(
         embeddableFactory => embeddableFactory.type === embeddableType
       ) as EmbeddableFactory<EmbeddableInput>;
@@ -82,7 +84,7 @@ const embeddable = () => ({
 
       const embeddableObject = await factory.createFromSavedObject(input.id, input);
 
-      embeddablesRegistry[input.id] = embeddableObject;
+      embeddablesRegistry[uniqueId] = embeddableObject;
       ReactDOM.unmountComponentAtNode(domNode);
 
       const subscription = embeddableObject.getInput$().subscribe(function(updatedInput) {
@@ -100,12 +102,12 @@ const embeddable = () => ({
         subscription.unsubscribe();
         handlers.onEmbeddableDestroyed();
 
-        delete embeddablesRegistry[input.id];
+        delete embeddablesRegistry[uniqueId];
 
         return ReactDOM.unmountComponentAtNode(domNode);
       });
     } else {
-      embeddablesRegistry[input.id].updateInput(input);
+      embeddablesRegistry[uniqueId].updateInput(input);
     }
   },
 });
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js b/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js
index 1926fb4aaa5eb..114a457d167e7 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js
+++ b/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js
@@ -54,6 +54,7 @@ export const ElementContent = compose(
     onComplete,
     onEmbeddableInputChange,
     onEmbeddableDestroyed,
+    getElementId,
   } = handlers;
 
   return Style.it(
@@ -76,7 +77,14 @@ export const ElementContent = compose(
           config={renderable.value}
           css={renderable.css} // This is an actual CSS stylesheet string, it will be scoped by RenderElement
           size={size} // Size is only passed for the purpose of triggering the resize event, it isn't really used otherwise
-          handlers={{ getFilter, setFilter, done, onEmbeddableInputChange, onEmbeddableDestroyed }}
+          handlers={{
+            getFilter,
+            setFilter,
+            done,
+            onEmbeddableInputChange,
+            onEmbeddableDestroyed,
+            getElementId,
+          }}
         />
       </ElementShareContainer>
     </div>
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js b/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js
index e93cea597901f..d71c5ead2c802 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js
+++ b/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js
@@ -36,6 +36,8 @@ export const createHandlers = dispatch => {
         completeFn = fn;
       },
 
+      getElementId: () => element.id,
+
       onEmbeddableInputChange(embeddableExpression) {
         dispatch(updateEmbeddableExpression({ elementId: element.id, embeddableExpression }));
       },
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx
index 317a3417841b8..c4a009db3a376 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx
@@ -67,6 +67,7 @@ export class RenderedElementComponent extends PureComponent<Props> {
         done: () => {},
         onDestroy: () => {},
         onResize: () => {},
+        getElementId: () => '',
         setFilter: () => {},
         getFilter: () => '',
         onEmbeddableInputChange: () => {},
diff --git a/x-pack/legacy/plugins/canvas/types/renderers.ts b/x-pack/legacy/plugins/canvas/types/renderers.ts
index af1710e69c257..2564b045d1cf7 100644
--- a/x-pack/legacy/plugins/canvas/types/renderers.ts
+++ b/x-pack/legacy/plugins/canvas/types/renderers.ts
@@ -9,6 +9,8 @@ type GenericCallback = (callback: () => void) => void;
 export interface RendererHandlers {
   /** Handler to invoke when an element has finished rendering */
   done: () => void;
+  /** Get the id of the element being rendered.  Can be used as a unique ID in a render function */
+  getElementId: () => string;
   /** Handler to invoke when an element is deleted or changes to a different render type */
   onDestroy: GenericCallback;
   /** Handler to invoke when an element's dimensions have changed*/