diff --git a/package.json b/package.json
index 98b2252cc0dba1..950a916b2419f7 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.14",
     "@elastic/ems-client": "7.14.0",
-    "@elastic/eui": "36.1.0",
+    "@elastic/eui": "37.1.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "^9.0.1-kibana3",
     "@elastic/maki": "6.3.0",
diff --git a/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts b/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts
index 476425487df1bf..719301bce8e068 100644
--- a/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts
+++ b/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts
@@ -13,9 +13,6 @@ import type { EsQueryConfig } from '@kbn/es-query';
  * registering a new instance of the rule data client
  * in a new plugin will require updating the below data structure
  * to include the index name where the alerts as data will be written to.
- *
- * This doesn't work in combination with the `xpack.ruleRegistry.index`
- * setting, with which the user can change the index prefix.
  */
 
 export const AlertConsumers = {
@@ -24,7 +21,7 @@ export const AlertConsumers = {
   INFRASTRUCTURE: 'infrastructure',
   OBSERVABILITY: 'observability',
   SIEM: 'siem',
-  SYNTHETICS: 'synthetics',
+  UPTIME: 'uptime',
 } as const;
 export type AlertConsumers = typeof AlertConsumers[keyof typeof AlertConsumers];
 export type STATUS_VALUES = 'open' | 'acknowledged' | 'closed' | 'in-progress'; // TODO: remove 'in-progress' after migration to 'acknowledged'
@@ -35,7 +32,7 @@ export const mapConsumerToIndexName: Record<AlertConsumers, string | string[]> =
   infrastructure: '.alerts-observability.metrics',
   observability: '.alerts-observability',
   siem: ['.alerts-security.alerts', '.siem-signals'],
-  synthetics: '.alerts-observability-synthetics',
+  uptime: '.alerts-observability.uptime',
 };
 export type ValidFeatureId = keyof typeof mapConsumerToIndexName;
 
diff --git a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
index f723cf5bca23af..1f932d62c94b92 100644
--- a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
+++ b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
@@ -100,6 +100,8 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiDataGridSchema.jsonSortTextDesc": "Large-Small",
           "euiDataGridSchema.numberSortTextAsc": "Low-High",
           "euiDataGridSchema.numberSortTextDesc": "High-Low",
+          "euiDatePopoverButton.invalidTitle": [Function],
+          "euiDatePopoverButton.outdatedTitle": [Function],
           "euiFieldPassword.maskPassword": "Mask password",
           "euiFieldPassword.showPassword": "Show password as plain text. Note: this will visually expose your password on the screen.",
           "euiFilePicker.clearSelectedFiles": "Clear selected files",
diff --git a/src/core/public/i18n/i18n_eui_mapping.tsx b/src/core/public/i18n/i18n_eui_mapping.tsx
index 0a6c7a05e1c75e..98b3fa8f812114 100644
--- a/src/core/public/i18n/i18n_eui_mapping.tsx
+++ b/src/core/public/i18n/i18n_eui_mapping.tsx
@@ -497,6 +497,16 @@ export const getEuiContextMapping = (): EuiTokensObject => {
         description: 'Descending size label',
       }
     ),
+    'euiDatePopoverButton.invalidTitle': ({ title }: EuiValues) =>
+      i18n.translate('core.euiDatePopoverButton.invalidTitle', {
+        defaultMessage: 'Invalid date: {title}',
+        values: { title },
+      }),
+    'euiDatePopoverButton.outdatedTitle': ({ title }: EuiValues) =>
+      i18n.translate('core.euiDatePopoverButton.outdatedTitle', {
+        defaultMessage: 'Update needed: {title}',
+        values: { title },
+      }),
     'euiFieldPassword.showPassword': i18n.translate('core.euiFieldPassword.showPassword', {
       defaultMessage:
         'Show password as plain text. Note: this will visually expose your password on the screen.',
diff --git a/src/core/server/environment/resolve_uuid.test.ts b/src/core/server/environment/resolve_uuid.test.ts
index 60d740ef121932..40db2d697906bc 100644
--- a/src/core/server/environment/resolve_uuid.test.ts
+++ b/src/core/server/environment/resolve_uuid.test.ts
@@ -227,7 +227,7 @@ describe('resolveInstanceUuid', () => {
       await expect(
         resolveInstanceUuid({ pathConfig, serverConfig, logger })
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Unable to read Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EACCES"`
+        `"Unable to read UUID file at data-folder/uuid.  Ensure Kibana has sufficient permissions to read / write to this file.  Error was: EACCES"`
       );
     });
     it('throws an explicit error for file write errors', async () => {
@@ -235,7 +235,7 @@ describe('resolveInstanceUuid', () => {
       await expect(
         resolveInstanceUuid({ pathConfig, serverConfig, logger })
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Unable to write Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EISDIR"`
+        `"Unable to write to UUID file at data-folder/uuid. Ensure Kibana has sufficient permissions to read / write to this file.  Error was: EISDIR"`
       );
     });
   });
diff --git a/src/core/server/environment/resolve_uuid.ts b/src/core/server/environment/resolve_uuid.ts
index aaee205dfbb902..74201a7ffa04ff 100644
--- a/src/core/server/environment/resolve_uuid.ts
+++ b/src/core/server/environment/resolve_uuid.ts
@@ -79,8 +79,8 @@ async function readUuidFromFile(filepath: string, logger: Logger): Promise<strin
       return undefined;
     }
     throw new Error(
-      'Unable to read Kibana UUID file, please check the uuid.server configuration ' +
-        'value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. ' +
+      `Unable to read UUID file at ${filepath}.  ` +
+        'Ensure Kibana has sufficient permissions to read / write to this file.  ' +
         `Error was: ${e.code}`
     );
   }
@@ -91,8 +91,8 @@ async function writeUuidToFile(filepath: string, uuidValue: string) {
     return await writeFile(filepath, uuidValue, { encoding: FILE_ENCODING });
   } catch (e) {
     throw new Error(
-      'Unable to write Kibana UUID file, please check the uuid.server configuration ' +
-        'value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. ' +
+      `Unable to write to UUID file at ${filepath}. ` +
+        'Ensure Kibana has sufficient permissions to read / write to this file.  ' +
         `Error was: ${e.code}`
     );
   }
diff --git a/src/core/server/execution_context/execution_context_service.mock.ts b/src/core/server/execution_context/execution_context_service.mock.ts
index 2e31145f6c0ee9..68aab7a5b84f84 100644
--- a/src/core/server/execution_context/execution_context_service.mock.ts
+++ b/src/core/server/execution_context/execution_context_service.mock.ts
@@ -6,12 +6,18 @@
  * Side Public License, v 1.
  */
 
+import type { KibanaExecutionContext } from '../../types';
 import type {
   IExecutionContext,
   InternalExecutionContextSetup,
   ExecutionContextSetup,
 } from './execution_context_service';
 
+// attempted removal of any: unsuccessful! In theory, replaceable with <R>/R
+function withContextMock(context: KibanaExecutionContext | undefined, fn: () => any): any {
+  return fn();
+}
+
 const createExecutionContextMock = () => {
   const mock: jest.Mocked<IExecutionContext> = {
     set: jest.fn(),
@@ -21,6 +27,7 @@ const createExecutionContextMock = () => {
     getParentContextFrom: jest.fn(),
     getAsHeader: jest.fn(),
   };
+  mock.withContext.mockImplementation(withContextMock);
   return mock;
 };
 const createInternalSetupContractMock = () => {
@@ -32,6 +39,7 @@ const createSetupContractMock = () => {
   const mock: jest.Mocked<ExecutionContextSetup> = {
     withContext: jest.fn(),
   };
+  mock.withContext.mockImplementation(withContextMock);
   return mock;
 };
 
diff --git a/src/core/server/execution_context/execution_context_service.test.ts b/src/core/server/execution_context/execution_context_service.test.ts
index 3abaa13d11103c..3fa4de34ebda08 100644
--- a/src/core/server/execution_context/execution_context_service.test.ts
+++ b/src/core/server/execution_context/execution_context_service.test.ts
@@ -346,7 +346,7 @@ describe('ExecutionContextService', () => {
             id: 'id-a',
             description: 'description-a',
           },
-          (i) => i
+          () => null
         );
         expect(loggingSystemMock.collect(core.logger).debug).toMatchInlineSnapshot(`
                   Array [
@@ -378,6 +378,26 @@ describe('ExecutionContextService', () => {
 
         expect(result).toBeUndefined();
       });
+      it('executes provided function when disabled', async () => {
+        const coreWithDisabledService = mockCoreContext.create();
+        coreWithDisabledService.configService.atPath.mockReturnValue(
+          new BehaviorSubject({ enabled: false })
+        );
+        const disabledService = new ExecutionContextService(coreWithDisabledService).setup();
+        const fn = jest.fn();
+
+        disabledService.withContext(
+          {
+            type: 'type-b',
+            name: 'name-b',
+            id: 'id-b',
+            description: 'description-b',
+          },
+          fn
+        );
+
+        expect(fn).toHaveBeenCalledTimes(1);
+      });
     });
 
     describe('getAsHeader', () => {
@@ -387,6 +407,21 @@ describe('ExecutionContextService', () => {
         expect(service.getAsHeader()).toBe('1234');
       });
 
+      it('falls back to "unknownId" if no id provided', async () => {
+        expect(service.getAsHeader()).toBe('unknownId');
+      });
+
+      it('falls back to "unknownId" and context if no id provided', async () => {
+        service.set({
+          type: 'type-a',
+          name: 'name-a',
+          id: 'id-a',
+          description: 'description-a',
+        });
+
+        expect(service.getAsHeader()).toBe('unknownId;kibana:type-a:name-a:id-a');
+      });
+
       it('returns request id and registered context', async () => {
         service.setRequestId('1234');
         service.set({
diff --git a/src/core/server/execution_context/execution_context_service.ts b/src/core/server/execution_context/execution_context_service.ts
index 5a8d104cebcd98..41b225cf1d0f3a 100644
--- a/src/core/server/execution_context/execution_context_service.ts
+++ b/src/core/server/execution_context/execution_context_service.ts
@@ -34,7 +34,7 @@ export interface IExecutionContext {
    * https://nodejs.org/api/async_context.html#async_context_asynclocalstorage_enterwith_store
    */
   get(): IExecutionContextContainer | undefined;
-  withContext<R>(context: KibanaExecutionContext | undefined, fn: (...args: any[]) => R): R;
+  withContext<R>(context: KibanaExecutionContext | undefined, fn: () => R): R;
   /**
    * returns serialized representation to send as a header
    **/
@@ -153,8 +153,11 @@ export class ExecutionContextService
 
   private getAsHeader(): string | undefined {
     if (!this.enabled) return;
-    const stringifiedCtx = this.contextStore.getStore()?.toString();
-    const requestId = this.requestIdStore.getStore()?.requestId;
-    return stringifiedCtx ? `${requestId};kibana:${stringifiedCtx}` : requestId;
+    // requestId may not be present in the case of FakeRequest
+    const requestId = this.requestIdStore.getStore()?.requestId ?? 'unknownId';
+    const executionContext = this.contextStore.getStore()?.toString();
+    const executionContextStr = executionContext ? `;kibana:${executionContext}` : '';
+
+    return `${requestId}${executionContextStr}`;
   }
 }
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index e1900019a5b300..46326fcc3b52e7 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -75,7 +75,7 @@ export const LICENSE_OVERRIDES = {
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   'node-sql-parser@3.6.1': ['(GPL-2.0 OR MIT)'], // GPL-2.0* https://github.com/taozhi8833998/node-sql-parser
   '@elastic/ems-client@7.14.0': ['Elastic License 2.0'],
-  '@elastic/eui@36.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@37.1.1': ['SSPL-1.0 OR Elastic License 2.0'],
 
   // TODO can be removed if the https://github.com/jindw/xmldom/issues/239 is released
   'xmldom@0.1.27': ['MIT'],
diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
index 419d4f0854ecc7..0244cb2cd91150 100644
--- a/src/dev/typescript/projects.ts
+++ b/src/dev/typescript/projects.ts
@@ -40,6 +40,22 @@ export const PROJECTS = [
   createProject('x-pack/plugins/security_solution/cypress/tsconfig.json', {
     name: 'security_solution/cypress',
   }),
+  createProject(
+    'x-pack/plugins/enterprise_search/public/applications/shared/cypress/tsconfig.json',
+    { name: 'enterprise_search/shared/cypress' }
+  ),
+  createProject(
+    'x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/tsconfig.json',
+    { name: 'enterprise_search/overview/cypress' }
+  ),
+  createProject(
+    'x-pack/plugins/enterprise_search/public/applications/app_search/cypress/tsconfig.json',
+    { name: 'enterprise_search/app_search/cypress' }
+  ),
+  createProject(
+    'x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/tsconfig.json',
+    { name: 'enterprise_search/workplace_search/cypress' }
+  ),
   createProject('x-pack/plugins/osquery/cypress/tsconfig.json', {
     name: 'osquery/cypress',
   }),
diff --git a/src/plugins/kibana_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap b/src/plugins/kibana_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap
deleted file mode 100644
index b5f501eb88a013..00000000000000
--- a/src/plugins/kibana_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap
+++ /dev/null
@@ -1,391 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`GettingStarted dark mode on 1`] = `
-<section
-  aria-labelledby="kbnOverviewGettingStarted__title"
-  className="kbnOverviewGettingStarted"
->
-  <EuiFlexGroup
-    alignItems="center"
-  >
-    <EuiFlexItem
-      className="kbnOverviewGettingStarted__content"
-    >
-      <div>
-        <EuiTitle
-          size="s"
-        >
-          <h2
-            id="kbnOverviewGettingStarted__title"
-          >
-            <FormattedMessage
-              defaultMessage="Getting started with Kibana"
-              id="kibanaOverview.gettingStarted.title"
-              values={Object {}}
-            />
-          </h2>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiText>
-          <p>
-            <FormattedMessage
-              defaultMessage="Kibana empowers you to visualize your data, your way.  Start with one question, and see where the answer leads you."
-              id="kibanaOverview.gettingStarted.description"
-              values={Object {}}
-            />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="xl"
-        />
-        <EuiFlexGrid
-          className="kbnOverviewGettingStarted__apps"
-          columns={2}
-        >
-          <EuiFlexItem
-            key="Dashboard"
-          >
-            <EuiCard
-              description="Analyze data in dashboards."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="dashboardApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Dashboard"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Discover"
-          >
-            <EuiCard
-              description="Search and find insights."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="discoverApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Discover"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Canvas"
-          >
-            <EuiCard
-              description="Design pixel-perfect reports."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="canvasApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Canvas"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Maps"
-          >
-            <EuiCard
-              description="Plot geographic data."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="gisApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Maps"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Machine Learning"
-          >
-            <EuiCard
-              description="Model, predict, and detect."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="machineLearningApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Machine Learning"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Graph"
-          >
-            <EuiCard
-              description="Reveal patterns and relationships."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="graphApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Graph"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-        </EuiFlexGrid>
-        <EuiSpacer
-          size="xl"
-        />
-        <RedirectAppLinks>
-          <EuiButton
-            fill={true}
-            href="/app/management/kibana/indexPatterns"
-            iconType="indexOpen"
-          >
-            <FormattedMessage
-              defaultMessage="Add your data"
-              id="kibanaOverview.gettingStarted.addDataButtonLabel"
-              values={Object {}}
-            />
-          </EuiButton>
-        </RedirectAppLinks>
-      </div>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="kbnOverviewGettingStarted__graphic"
-    >
-      <EuiImage
-        alt="Kibana visualizations illustration"
-        url="/plugins/kibanaOverview/assets/kibana_montage_dark.svg"
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</section>
-`;
-
-exports[`GettingStarted render 1`] = `
-<section
-  aria-labelledby="kbnOverviewGettingStarted__title"
-  className="kbnOverviewGettingStarted"
->
-  <EuiFlexGroup
-    alignItems="center"
-  >
-    <EuiFlexItem
-      className="kbnOverviewGettingStarted__content"
-    >
-      <div>
-        <EuiTitle
-          size="s"
-        >
-          <h2
-            id="kbnOverviewGettingStarted__title"
-          >
-            <FormattedMessage
-              defaultMessage="Getting started with Kibana"
-              id="kibanaOverview.gettingStarted.title"
-              values={Object {}}
-            />
-          </h2>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiText>
-          <p>
-            <FormattedMessage
-              defaultMessage="Kibana empowers you to visualize your data, your way.  Start with one question, and see where the answer leads you."
-              id="kibanaOverview.gettingStarted.description"
-              values={Object {}}
-            />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="xl"
-        />
-        <EuiFlexGrid
-          className="kbnOverviewGettingStarted__apps"
-          columns={2}
-        >
-          <EuiFlexItem
-            key="Dashboard"
-          >
-            <EuiCard
-              description="Analyze data in dashboards."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="dashboardApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Dashboard"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Discover"
-          >
-            <EuiCard
-              description="Search and find insights."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="discoverApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Discover"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Canvas"
-          >
-            <EuiCard
-              description="Design pixel-perfect reports."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="canvasApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Canvas"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Maps"
-          >
-            <EuiCard
-              description="Plot geographic data."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="gisApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Maps"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Machine Learning"
-          >
-            <EuiCard
-              description="Model, predict, and detect."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="machineLearningApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Machine Learning"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem
-            key="Graph"
-          >
-            <EuiCard
-              description="Reveal patterns and relationships."
-              display="transparent"
-              icon={
-                <EuiIcon
-                  color="text"
-                  size="l"
-                  type="graphApp"
-                />
-              }
-              layout="horizontal"
-              paddingSize="none"
-              title="Graph"
-              titleElement="h3"
-              titleSize="xs"
-            />
-          </EuiFlexItem>
-        </EuiFlexGrid>
-        <EuiSpacer
-          size="xl"
-        />
-        <RedirectAppLinks>
-          <EuiButton
-            fill={true}
-            href="/app/management/kibana/indexPatterns"
-            iconType="indexOpen"
-          >
-            <FormattedMessage
-              defaultMessage="Add your data"
-              id="kibanaOverview.gettingStarted.addDataButtonLabel"
-              values={Object {}}
-            />
-          </EuiButton>
-        </RedirectAppLinks>
-      </div>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="kbnOverviewGettingStarted__graphic"
-    >
-      <EuiImage
-        alt="Kibana visualizations illustration"
-        url="/plugins/kibanaOverview/assets/kibana_montage_light.svg"
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</section>
-`;
diff --git a/src/plugins/kibana_overview/public/components/getting_started/getting_started.test.tsx b/src/plugins/kibana_overview/public/components/getting_started/getting_started.test.tsx
deleted file mode 100644
index a2ce059f913f41..00000000000000
--- a/src/plugins/kibana_overview/public/components/getting_started/getting_started.test.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import React from 'react';
-import { GettingStarted } from './getting_started';
-import { shallowWithIntl } from '@kbn/test/jest';
-import { FeatureCatalogueCategory } from 'src/plugins/home/public';
-
-const addBasePathMock = jest.fn((path: string) => (path ? path : 'path'));
-
-const mockApps = [
-  {
-    category: FeatureCatalogueCategory.DATA,
-    description: 'Display and share a collection of visualizations and saved searches.',
-    icon: 'dashboardApp',
-    id: 'dashboard',
-    order: 100,
-    path: 'path-to-dashboard',
-    showOnHomePage: false,
-    solutionId: 'kibana',
-    subtitle: 'Analyze data in dashboards.',
-    title: 'Dashboard',
-  },
-  {
-    category: FeatureCatalogueCategory.DATA,
-    description: 'Interactively explore your data by querying and filtering raw documents.',
-    icon: 'discoverApp',
-    id: 'discover',
-    order: 200,
-    path: 'path-to-discover',
-
-    showOnHomePage: false,
-    solutionId: 'kibana',
-    subtitle: 'Search and find insights.',
-    title: 'Discover',
-  },
-  {
-    category: FeatureCatalogueCategory.DATA,
-    description: 'Showcase your data in a pixel-perfect way.',
-    icon: 'canvasApp',
-    id: 'canvas',
-    order: 300,
-    path: 'path-to-canvas',
-
-    showOnHomePage: false,
-    solutionId: 'kibana',
-    subtitle: 'Design pixel-perfect reports.',
-    title: 'Canvas',
-  },
-  {
-    category: FeatureCatalogueCategory.DATA,
-    description: 'Explore geospatial data from Elasticsearch and the Elastic Maps Service.',
-    icon: 'gisApp',
-    id: 'maps',
-    order: 400,
-    path: 'path-to-maps',
-    showOnHomePage: false,
-    solutionId: 'kibana',
-    subtitle: 'Plot geographic data.',
-    title: 'Maps',
-  },
-  {
-    category: FeatureCatalogueCategory.DATA,
-    description:
-      'Automatically model the normal behavior of your time series data to detect anomalies.',
-    icon: 'machineLearningApp',
-    id: 'ml',
-    order: 500,
-    path: 'path-to-ml',
-    showOnHomePage: false,
-    solutionId: 'kibana',
-    subtitle: 'Model, predict, and detect.',
-    title: 'Machine Learning',
-  },
-  {
-    category: FeatureCatalogueCategory.DATA,
-    description: 'Surface and analyze relevant relationships in your Elasticsearch data.',
-    icon: 'graphApp',
-    id: 'graph',
-    order: 600,
-    path: 'path-to-graph',
-    showOnHomePage: false,
-    solutionId: 'kibana',
-    subtitle: 'Reveal patterns and relationships.',
-    title: 'Graph',
-  },
-];
-
-describe('GettingStarted', () => {
-  test('render', () => {
-    const component = shallowWithIntl(
-      <GettingStarted addBasePath={addBasePathMock} isDarkTheme={false} apps={mockApps} />
-    );
-    expect(component).toMatchSnapshot();
-  });
-  test('dark mode on', () => {
-    const component = shallowWithIntl(
-      <GettingStarted addBasePath={addBasePathMock} isDarkTheme={true} apps={mockApps} />
-    );
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/src/plugins/kibana_overview/public/components/getting_started/getting_started.tsx b/src/plugins/kibana_overview/public/components/getting_started/getting_started.tsx
deleted file mode 100644
index 56247c4e91fa12..00000000000000
--- a/src/plugins/kibana_overview/public/components/getting_started/getting_started.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import React, { FC } from 'react';
-import {
-  EuiButton,
-  EuiCard,
-  EuiFlexGrid,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiImage,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { CoreStart } from 'kibana/public';
-import { RedirectAppLinks, useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { FeatureCatalogueEntry } from '../../../../../../src/plugins/home/public';
-import { PLUGIN_ID } from '../../../common';
-
-interface Props {
-  addBasePath: (path: string) => string;
-  isDarkTheme: boolean;
-  apps: FeatureCatalogueEntry[];
-}
-
-export const GettingStarted: FC<Props> = ({ addBasePath, isDarkTheme, apps }) => {
-  const {
-    services: { application },
-  } = useKibana<CoreStart>();
-  const gettingStartedGraphicURL = `/plugins/${PLUGIN_ID}/assets/kibana_montage_${
-    isDarkTheme ? 'dark' : 'light'
-  }.svg`;
-
-  return (
-    <section
-      aria-labelledby="kbnOverviewGettingStarted__title"
-      className="kbnOverviewGettingStarted"
-    >
-      <EuiFlexGroup alignItems="center">
-        <EuiFlexItem className="kbnOverviewGettingStarted__content">
-          <div>
-            <EuiTitle size="s">
-              <h2 id="kbnOverviewGettingStarted__title">
-                <FormattedMessage
-                  id="kibanaOverview.gettingStarted.title"
-                  defaultMessage="Getting started with Kibana"
-                />
-              </h2>
-            </EuiTitle>
-
-            <EuiSpacer size="m" />
-
-            <EuiText>
-              <p>
-                <FormattedMessage
-                  id="kibanaOverview.gettingStarted.description"
-                  defaultMessage="Kibana empowers you to visualize your data, your way.  Start with one question, and see where the answer leads you."
-                />
-              </p>
-            </EuiText>
-
-            <EuiSpacer size="xl" />
-
-            <EuiFlexGrid className="kbnOverviewGettingStarted__apps" columns={2}>
-              {apps.map(({ subtitle = '', icon, title }) => (
-                <EuiFlexItem key={title}>
-                  <EuiCard
-                    description={subtitle}
-                    display="transparent"
-                    icon={<EuiIcon color="text" size="l" type={icon} />}
-                    layout="horizontal"
-                    paddingSize="none"
-                    title={title}
-                    titleElement="h3"
-                    titleSize="xs"
-                  />
-                </EuiFlexItem>
-              ))}
-            </EuiFlexGrid>
-
-            <EuiSpacer size="xl" />
-
-            <RedirectAppLinks application={application}>
-              <EuiButton
-                fill
-                iconType="indexOpen"
-                href={addBasePath('/app/management/kibana/indexPatterns')}
-              >
-                <FormattedMessage
-                  defaultMessage="Add your data"
-                  id="kibanaOverview.gettingStarted.addDataButtonLabel"
-                />
-              </EuiButton>
-            </RedirectAppLinks>
-          </div>
-        </EuiFlexItem>
-
-        <EuiFlexItem className="kbnOverviewGettingStarted__graphic">
-          <EuiImage
-            alt="Kibana visualizations illustration"
-            url={addBasePath(gettingStartedGraphicURL)}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </section>
-  );
-};
diff --git a/src/plugins/kibana_overview/public/components/getting_started/index.ts b/src/plugins/kibana_overview/public/components/getting_started/index.ts
deleted file mode 100644
index 10977941afeeeb..00000000000000
--- a/src/plugins/kibana_overview/public/components/getting_started/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export * from './getting_started';
diff --git a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
index a32e27050fad17..6581fcd88cb77f 100644
--- a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
+++ b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
@@ -233,6 +233,9 @@ exports[`Overview render 1`] = `
     addBasePath={
       [MockFunction] {
         "calls": Array [
+          Array [
+            "home#/tutorial_directory",
+          ],
           Array [
             "kibana_landing_page",
           ],
@@ -259,6 +262,10 @@ exports[`Overview render 1`] = `
           ],
         ],
         "results": Array [
+          Object {
+            "type": "return",
+            "value": "home#/tutorial_directory",
+          },
           Object {
             "type": "return",
             "value": "kibana_landing_page",
@@ -534,6 +541,9 @@ exports[`Overview without features 1`] = `
     addBasePath={
       [MockFunction] {
         "calls": Array [
+          Array [
+            "home#/tutorial_directory",
+          ],
           Array [
             "kibana_landing_page",
           ],
@@ -558,6 +568,12 @@ exports[`Overview without features 1`] = `
           Array [
             "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
           ],
+          Array [
+            "home#/tutorial_directory",
+          ],
+          Array [
+            "home#/tutorial_directory",
+          ],
           Array [
             "kibana_landing_page",
           ],
@@ -584,6 +600,10 @@ exports[`Overview without features 1`] = `
           ],
         ],
         "results": Array [
+          Object {
+            "type": "return",
+            "value": "home#/tutorial_directory",
+          },
           Object {
             "type": "return",
             "value": "kibana_landing_page",
@@ -616,6 +636,14 @@ exports[`Overview without features 1`] = `
             "type": "return",
             "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
           },
+          Object {
+            "type": "return",
+            "value": "home#/tutorial_directory",
+          },
+          Object {
+            "type": "return",
+            "value": "home#/tutorial_directory",
+          },
           Object {
             "type": "return",
             "value": "kibana_landing_page",
@@ -760,6 +788,9 @@ exports[`Overview without solutions 1`] = `
             addBasePath={
               [MockFunction] {
                 "calls": Array [
+                  Array [
+                    "home#/tutorial_directory",
+                  ],
                   Array [
                     "kibana_landing_page",
                   ],
@@ -784,8 +815,15 @@ exports[`Overview without solutions 1`] = `
                   Array [
                     "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
                   ],
+                  Array [
+                    "home#/tutorial_directory",
+                  ],
                 ],
                 "results": Array [
+                  Object {
+                    "type": "return",
+                    "value": "home#/tutorial_directory",
+                  },
                   Object {
                     "type": "return",
                     "value": "kibana_landing_page",
@@ -818,6 +856,10 @@ exports[`Overview without solutions 1`] = `
                     "type": "return",
                     "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
                   },
+                  Object {
+                    "type": "return",
+                    "value": "home#/tutorial_directory",
+                  },
                 ],
               }
             }
@@ -829,6 +871,9 @@ exports[`Overview without solutions 1`] = `
             addBasePath={
               [MockFunction] {
                 "calls": Array [
+                  Array [
+                    "home#/tutorial_directory",
+                  ],
                   Array [
                     "kibana_landing_page",
                   ],
@@ -853,8 +898,15 @@ exports[`Overview without solutions 1`] = `
                   Array [
                     "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
                   ],
+                  Array [
+                    "home#/tutorial_directory",
+                  ],
                 ],
                 "results": Array [
+                  Object {
+                    "type": "return",
+                    "value": "home#/tutorial_directory",
+                  },
                   Object {
                     "type": "return",
                     "value": "kibana_landing_page",
@@ -887,6 +939,10 @@ exports[`Overview without solutions 1`] = `
                     "type": "return",
                     "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
                   },
+                  Object {
+                    "type": "return",
+                    "value": "home#/tutorial_directory",
+                  },
                 ],
               }
             }
@@ -904,6 +960,9 @@ exports[`Overview without solutions 1`] = `
     addBasePath={
       [MockFunction] {
         "calls": Array [
+          Array [
+            "home#/tutorial_directory",
+          ],
           Array [
             "kibana_landing_page",
           ],
@@ -928,8 +987,15 @@ exports[`Overview without solutions 1`] = `
           Array [
             "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
           ],
+          Array [
+            "home#/tutorial_directory",
+          ],
         ],
         "results": Array [
+          Object {
+            "type": "return",
+            "value": "home#/tutorial_directory",
+          },
           Object {
             "type": "return",
             "value": "kibana_landing_page",
@@ -962,6 +1028,10 @@ exports[`Overview without solutions 1`] = `
             "type": "return",
             "value": "/plugins/kibanaOverview/assets/solutions_solution_4_2x.png",
           },
+          Object {
+            "type": "return",
+            "value": "home#/tutorial_directory",
+          },
         ],
       }
     }
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.test.tsx b/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
index 9d260469625ada..6320b5070a8a67 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
@@ -18,6 +18,11 @@ jest.mock('../../../../../../src/plugins/kibana_react/public', () => ({
       http: { basePath: { prepend: jest.fn((path: string) => (path ? path : 'path')) } },
       data: { indexPatterns: {} },
       uiSettings: { get: jest.fn() },
+      docLinks: {
+        links: {
+          kibana: 'kibana_docs_url',
+        },
+      },
     },
   }),
   RedirectAppLinks: jest.fn((element: JSX.Element) => element),
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx
index 9bba923371f640..a037cbc214266a 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx
@@ -24,6 +24,7 @@ import {
   RedirectAppLinks,
   useKibana,
   KibanaPageTemplate,
+  KibanaPageTemplateProps,
   overviewPageActions,
   OverviewPageFooter,
 } from '../../../../../../src/plugins/kibana_react/public';
@@ -36,7 +37,6 @@ import {
 import { PLUGIN_ID, PLUGIN_PATH } from '../../../common';
 import { AppPluginStartDependencies } from '../../types';
 import { AddData } from '../add_data';
-import { GettingStarted } from '../getting_started';
 import { ManageData } from '../manage_data';
 import { NewsFeed } from '../news_feed';
 import { METRIC_TYPE, trackUiMetric } from '../../lib/ui_metric';
@@ -53,7 +53,7 @@ interface Props {
 export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) => {
   const [isNewKibanaInstance, setNewKibanaInstance] = useState(false);
   const {
-    services: { http, data, uiSettings, application },
+    services: { http, docLinks, data, uiSettings, application },
   } = useKibana<CoreStart & AppPluginStartDependencies>();
   const addBasePath = http.basePath.prepend;
   const indexPatternService = data.indexPatterns;
@@ -72,6 +72,16 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
   const addDataFeatures = getFeaturesByCategory(FeatureCatalogueCategory.DATA);
   const manageDataFeatures = getFeaturesByCategory(FeatureCatalogueCategory.ADMIN);
   const devTools = findFeatureById('console');
+  const noDataConfig: KibanaPageTemplateProps['noDataConfig'] = {
+    solution: 'Analytics',
+    logo: 'logoKibana',
+    actions: {
+      beats: {
+        href: addBasePath(`home#/tutorial_directory`),
+      },
+    },
+    docsLink: docLinks.links.kibana,
+  };
 
   // Show card for console if none of the manage data plugins are available, most likely in OSS
   if (manageDataFeatures.length < 1 && devTools) {
@@ -127,126 +137,123 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
           hidden: isNewKibanaInstance,
         }),
       }}
+      noDataConfig={isNewKibanaInstance ? noDataConfig : undefined}
       template="empty"
     >
-      {isNewKibanaInstance ? (
-        <GettingStarted addBasePath={addBasePath} isDarkTheme={IS_DARK_THEME} apps={kibanaApps} />
-      ) : (
-        <>
-          <section aria-labelledby="kbnOverviewApps__title" className="kbnOverviewApps">
-            <EuiScreenReaderOnly>
-              <h2 id="kbnOverviewApps__title">
-                <FormattedMessage
-                  id="kibanaOverview.apps.title"
-                  defaultMessage="Explore these apps"
-                />
-              </h2>
-            </EuiScreenReaderOnly>
-
-            {mainApps.length ? (
-              <>
-                <EuiFlexGroup
-                  className="kbnOverviewApps__group kbnOverviewApps__group--primary"
-                  justifyContent="center"
-                >
-                  {mainApps.map(renderAppCard)}
-                </EuiFlexGroup>
+      <>
+        <section aria-labelledby="kbnOverviewApps__title" className="kbnOverviewApps">
+          <EuiScreenReaderOnly>
+            <h2 id="kbnOverviewApps__title">
+              <FormattedMessage
+                id="kibanaOverview.apps.title"
+                defaultMessage="Explore these apps"
+              />
+            </h2>
+          </EuiScreenReaderOnly>
 
-                <EuiSpacer size="l" />
-              </>
-            ) : null}
-
-            {remainingApps.length ? (
+          {mainApps.length ? (
+            <>
               <EuiFlexGroup
-                className="kbnOverviewApps__group kbnOverviewApps__group--secondary"
+                className="kbnOverviewApps__group kbnOverviewApps__group--primary"
                 justifyContent="center"
               >
-                {remainingApps.map(renderAppCard)}
+                {mainApps.map(renderAppCard)}
               </EuiFlexGroup>
-            ) : null}
-          </section>
 
-          <EuiHorizontalRule aria-hidden="true" margin="xl" />
+              <EuiSpacer size="l" />
+            </>
+          ) : null}
+
+          {remainingApps.length ? (
+            <EuiFlexGroup
+              className="kbnOverviewApps__group kbnOverviewApps__group--secondary"
+              justifyContent="center"
+            >
+              {remainingApps.map(renderAppCard)}
+            </EuiFlexGroup>
+          ) : null}
+        </section>
 
-          <EuiFlexGroup
-            alignItems="flexStart"
-            className={`kbnOverviewSupplements ${
-              newsFetchResult && newsFetchResult.feedItems.length
-                ? 'kbnOverviewSupplements--hasNews'
-                : 'kbnOverviewSupplements--noNews'
-            }`}
-          >
-            {newsFetchResult && newsFetchResult.feedItems.length ? (
-              <EuiFlexItem grow={1}>
-                <NewsFeed newsFetchResult={newsFetchResult} />
-              </EuiFlexItem>
-            ) : null}
+        <EuiHorizontalRule aria-hidden="true" margin="xl" />
 
-            <EuiFlexItem grow={3}>
-              {solutions.length ? (
-                <section aria-labelledby="kbnOverviewMore__title" className="kbnOverviewMore">
-                  <EuiTitle size="s">
-                    <h2 id="kbnOverviewMore__title">
-                      <FormattedMessage
-                        id="kibanaOverview.more.title"
-                        defaultMessage="Do more with Elastic"
-                      />
-                    </h2>
-                  </EuiTitle>
+        <EuiFlexGroup
+          alignItems="flexStart"
+          className={`kbnOverviewSupplements ${
+            newsFetchResult && newsFetchResult.feedItems.length
+              ? 'kbnOverviewSupplements--hasNews'
+              : 'kbnOverviewSupplements--noNews'
+          }`}
+        >
+          {newsFetchResult && newsFetchResult.feedItems.length ? (
+            <EuiFlexItem grow={1}>
+              <NewsFeed newsFetchResult={newsFetchResult} />
+            </EuiFlexItem>
+          ) : null}
 
-                  <EuiSpacer size="m" />
+          <EuiFlexItem grow={3}>
+            {solutions.length ? (
+              <section aria-labelledby="kbnOverviewMore__title" className="kbnOverviewMore">
+                <EuiTitle size="s">
+                  <h2 id="kbnOverviewMore__title">
+                    <FormattedMessage
+                      id="kibanaOverview.more.title"
+                      defaultMessage="Do more with Elastic"
+                    />
+                  </h2>
+                </EuiTitle>
 
-                  <EuiFlexGroup className="kbnOverviewMore__content">
-                    {solutions.map(({ id, title, description, icon, path }) => (
-                      <EuiFlexItem className="kbnOverviewMore__item" key={id}>
-                        <RedirectAppLinks application={application}>
-                          <EuiCard
-                            className={`kbnOverviewSolution ${id}`}
-                            description={description ? description : ''}
-                            href={addBasePath(path)}
-                            icon={
-                              <EuiToken
-                                className="kbnOverviewSolution__icon"
-                                fill="light"
-                                iconType={icon}
-                                shape="circle"
-                                size="l"
-                              />
-                            }
-                            image={addBasePath(getSolutionGraphicURL(snakeCase(id)))}
-                            title={title}
-                            titleElement="h3"
-                            titleSize="xs"
-                            onClick={() => {
-                              trackUiMetric(METRIC_TYPE.CLICK, `solution_panel_${id}`);
-                            }}
-                          />
-                        </RedirectAppLinks>
-                      </EuiFlexItem>
-                    ))}
-                  </EuiFlexGroup>
-                </section>
-              ) : (
-                <EuiFlexGroup
-                  className={`kbnOverviewData ${
-                    addDataFeatures.length === 1 && manageDataFeatures.length === 1
-                      ? 'kbnOverviewData--compressed'
-                      : 'kbnOverviewData--expanded'
-                  }`}
-                >
-                  <EuiFlexItem>
-                    <AddData addBasePath={addBasePath} features={addDataFeatures} />
-                  </EuiFlexItem>
+                <EuiSpacer size="m" />
 
-                  <EuiFlexItem>
-                    <ManageData addBasePath={addBasePath} features={manageDataFeatures} />
-                  </EuiFlexItem>
+                <EuiFlexGroup className="kbnOverviewMore__content">
+                  {solutions.map(({ id, title, description, icon, path }) => (
+                    <EuiFlexItem className="kbnOverviewMore__item" key={id}>
+                      <RedirectAppLinks application={application}>
+                        <EuiCard
+                          className={`kbnOverviewSolution ${id}`}
+                          description={description ? description : ''}
+                          href={addBasePath(path)}
+                          icon={
+                            <EuiToken
+                              className="kbnOverviewSolution__icon"
+                              fill="light"
+                              iconType={icon}
+                              shape="circle"
+                              size="l"
+                            />
+                          }
+                          image={addBasePath(getSolutionGraphicURL(snakeCase(id)))}
+                          title={title}
+                          titleElement="h3"
+                          titleSize="xs"
+                          onClick={() => {
+                            trackUiMetric(METRIC_TYPE.CLICK, `solution_panel_${id}`);
+                          }}
+                        />
+                      </RedirectAppLinks>
+                    </EuiFlexItem>
+                  ))}
                 </EuiFlexGroup>
-              )}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
-      )}
+              </section>
+            ) : (
+              <EuiFlexGroup
+                className={`kbnOverviewData ${
+                  addDataFeatures.length === 1 && manageDataFeatures.length === 1
+                    ? 'kbnOverviewData--compressed'
+                    : 'kbnOverviewData--expanded'
+                }`}
+              >
+                <EuiFlexItem>
+                  <AddData addBasePath={addBasePath} features={addDataFeatures} />
+                </EuiFlexItem>
+
+                <EuiFlexItem>
+                  <ManageData addBasePath={addBasePath} features={manageDataFeatures} />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            )}
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </>
 
       <EuiHorizontalRule margin="xl" aria-hidden="true" />
 
diff --git a/test/package/deb.yml b/test/package/deb.yml
index 9133402d3eee3c..294657e99473f7 100644
--- a/test/package/deb.yml
+++ b/test/package/deb.yml
@@ -6,7 +6,6 @@
     - assert_keystore_cli
     - assert_kibana_yml
     - assert_kibana_listening
-    # flaky https://github.com/elastic/kibana/issues/106749
-    # - assert_kibana_available
+    - assert_kibana_available
     - assert_kibana_log
     - assert_kibana_data
diff --git a/test/package/docker.yml b/test/package/docker.yml
index 141f18e2c222a7..bcc3f3e8f77923 100644
--- a/test/package/docker.yml
+++ b/test/package/docker.yml
@@ -4,5 +4,4 @@
     - install_docker
     - install_kibana_docker
     - assert_kibana_listening
-    # flaky https://github.com/elastic/kibana/issues/106749
-    # - assert_kibana_available
\ No newline at end of file
+    - assert_kibana_available
\ No newline at end of file
diff --git a/test/package/roles/assert_kibana_available/tasks/main.yml b/test/package/roles/assert_kibana_available/tasks/main.yml
index b096f9b87350d2..db3805f7ad7fb7 100644
--- a/test/package/roles/assert_kibana_available/tasks/main.yml
+++ b/test/package/roles/assert_kibana_available/tasks/main.yml
@@ -2,6 +2,7 @@
   uri:
     url: "http://localhost:5601/api/status"
     status_code: [200, 401]
+    timeout: 120
   register: result
   until: result.status != 503
   retries: 3
diff --git a/test/package/rpm.yml b/test/package/rpm.yml
index 5fb1d37a969181..456c2bdf18b72f 100644
--- a/test/package/rpm.yml
+++ b/test/package/rpm.yml
@@ -6,7 +6,6 @@
     - assert_keystore_cli
     - assert_kibana_yml
     - assert_kibana_listening
-    # flaky https://github.com/elastic/kibana/issues/106749
-    # - assert_kibana_available
+    - assert_kibana_available
     - assert_kibana_log
     - assert_kibana_data
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 197cf49edc147b..6f257fa1e0e682 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -381,6 +381,7 @@ export class AlertingPlugin {
       basePathService: core.http.basePath,
       eventLogger: this.eventLogger!,
       internalSavedObjectsRepository: core.savedObjects.createInternalRepository(['alert']),
+      executionContext: core.executionContext,
       ruleTypeRegistry: this.ruleTypeRegistry!,
       kibanaBaseUrl: this.kibanaBaseUrl,
       supportsEphemeralTasks: plugins.taskManager.supportsEphemeralTasks(),
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
index 4d876a1d6ecb55..26b17d76553fd2 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -27,6 +27,7 @@ import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
   httpServiceMock,
+  executionContextServiceMock,
 } from '../../../../../src/core/server/mocks';
 import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
 import { actionsMock, actionsClientMock } from '../../../actions/server/mocks';
@@ -89,6 +90,7 @@ describe('Task Runner', () => {
   type TaskRunnerFactoryInitializerParamsType = jest.Mocked<TaskRunnerContext> & {
     actionsPlugin: jest.Mocked<ActionsPluginStart>;
     eventLogger: jest.Mocked<IEventLogger>;
+    executionContext: ReturnType<typeof executionContextServiceMock.createInternalStartContract>;
   };
 
   const taskRunnerFactoryInitializerParams: TaskRunnerFactoryInitializerParamsType = {
@@ -97,6 +99,7 @@ describe('Task Runner', () => {
     getRulesClientWithRequest: jest.fn().mockReturnValue(rulesClient),
     encryptedSavedObjectsClient,
     logger: loggingSystemMock.create().get(),
+    executionContext: executionContextServiceMock.createInternalStartContract(),
     spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
     basePathService: httpServiceMock.createBasePath(),
     eventLogger: eventLoggerMock.create(),
@@ -185,6 +188,9 @@ describe('Task Runner', () => {
       (actionTypeId, actionId, params) => params
     );
     ruleTypeRegistry.get.mockReturnValue(alertType);
+    taskRunnerFactoryInitializerParams.executionContext.withContext.mockImplementation((ctx, fn) =>
+      fn()
+    );
   });
 
   test('successfully executes the task', async () => {
@@ -338,6 +344,17 @@ describe('Task Runner', () => {
       },
       { refresh: false, namespace: undefined }
     );
+
+    expect(taskRunnerFactoryInitializerParams.executionContext.withContext).toBeCalledTimes(1);
+    expect(taskRunnerFactoryInitializerParams.executionContext.withContext).toHaveBeenCalledWith(
+      {
+        id: '1',
+        name: 'execute test',
+        type: 'alert',
+        description: 'execute [test] with name [alert-name] in [default] namespace',
+      },
+      expect.any(Function)
+    );
   });
 
   testAgainstEphemeralSupport(
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
index 63748eafe037c6..6694146c3e2b92 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -262,44 +262,55 @@ export class TaskRunner<
 
     let updatedAlertTypeState: void | Record<string, unknown>;
     try {
-      updatedAlertTypeState = await this.alertType.executor({
-        alertId,
-        services: {
-          ...services,
-          alertInstanceFactory: createAlertInstanceFactory<
-            InstanceState,
-            InstanceContext,
-            WithoutReservedActionGroups<ActionGroupIds, RecoveryActionGroupId>
-          >(alertInstances),
-        },
-        params,
-        state: alertTypeState as State,
-        startedAt: this.taskInstance.startedAt!,
-        previousStartedAt: previousStartedAt ? new Date(previousStartedAt) : null,
-        spaceId,
-        namespace,
-        name,
-        tags,
-        createdBy,
-        updatedBy,
-        rule: {
+      const ctx = {
+        type: 'alert',
+        name: `execute ${alert.alertTypeId}`,
+        id: alertId,
+        description: `execute [${alert.alertTypeId}] with name [${name}] in [${
+          namespace ?? 'default'
+        }] namespace`,
+      };
+
+      updatedAlertTypeState = await this.context.executionContext.withContext(ctx, () =>
+        this.alertType.executor({
+          alertId,
+          services: {
+            ...services,
+            alertInstanceFactory: createAlertInstanceFactory<
+              InstanceState,
+              InstanceContext,
+              WithoutReservedActionGroups<ActionGroupIds, RecoveryActionGroupId>
+            >(alertInstances),
+          },
+          params,
+          state: alertTypeState as State,
+          startedAt: this.taskInstance.startedAt!,
+          previousStartedAt: previousStartedAt ? new Date(previousStartedAt) : null,
+          spaceId,
+          namespace,
           name,
           tags,
-          consumer,
-          producer: alertType.producer,
-          ruleTypeId: alert.alertTypeId,
-          ruleTypeName: alertType.name,
-          enabled,
-          schedule,
-          actions,
           createdBy,
           updatedBy,
-          createdAt,
-          updatedAt,
-          throttle,
-          notifyWhen,
-        },
-      });
+          rule: {
+            name,
+            tags,
+            consumer,
+            producer: alertType.producer,
+            ruleTypeId: alert.alertTypeId,
+            ruleTypeName: alertType.name,
+            enabled,
+            schedule,
+            actions,
+            createdBy,
+            updatedBy,
+            createdAt,
+            updatedAt,
+            throttle,
+            notifyWhen,
+          },
+        })
+      );
     } catch (err) {
       event.message = `alert execution failure: ${alertLabel}`;
       event.error = event.error || {};
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
index 61aa168acf6172..d2626079583473 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -19,6 +19,9 @@ import { alertsMock, rulesClientMock } from '../mocks';
 import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
 import { UntypedNormalizedAlertType } from '../rule_type_registry';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
+import { executionContextServiceMock } from '../../../../../src/core/server/mocks';
+
+const executionContext = executionContextServiceMock.createSetupContract();
 
 const alertType: UntypedNormalizedAlertType = {
   id: 'test',
@@ -81,6 +84,7 @@ describe('Task Runner Factory', () => {
     kibanaBaseUrl: 'https://localhost:5601',
     supportsEphemeralTasks: true,
     maxEphemeralActionsPerAlert: new Promise((resolve) => resolve(10)),
+    executionContext,
   };
 
   beforeEach(() => {
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
index 4d9c7b37ed645b..524b779a0d9aca 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
@@ -6,11 +6,12 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import {
+import type {
   Logger,
   KibanaRequest,
   ISavedObjectsRepository,
   IBasePath,
+  ExecutionContextStart,
 } from '../../../../../src/core/server';
 import { RunContext } from '../../../task_manager/server';
 import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
@@ -36,6 +37,7 @@ export interface TaskRunnerContext {
   actionsPlugin: ActionsPluginStartContract;
   eventLogger: IEventLogger;
   encryptedSavedObjectsClient: EncryptedSavedObjectsClient;
+  executionContext: ExecutionContextStart;
   spaceIdToNamespace: SpaceIdToNamespaceFunction;
   basePathService: IBasePath;
   internalSavedObjectsRepository: ISavedObjectsRepository;
diff --git a/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts b/x-pack/plugins/apm/common/tutorial/instructions/apm_agent_instructions.ts
similarity index 99%
rename from x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
rename to x-pack/plugins/apm/common/tutorial/instructions/apm_agent_instructions.ts
index e2bf09dae5bede..daac81298008ec 100644
--- a/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
+++ b/x-pack/plugins/apm/common/tutorial/instructions/apm_agent_instructions.ts
@@ -457,8 +457,8 @@ export const createDotNetAgentInstructions = (
       Core download the [Elastic.Apm.NetCoreAll]({netCoreAllApmPackageLink}) package. This package will automatically add every \
       agent component to your application. \n\n In case you would like to minimize the dependencies, you can use the \
       [Elastic.Apm.AspNetCore]({aspNetCorePackageLink}) package for just \
-      ASP.NET Core monitoring or the [Elastic.Apm.EfCore]({efCorePackageLink}) package for just Entity Framework Core monitoring. \n\n \
-      In case you only want to use the public Agent API for manual instrumentation use the [Elastic.Apm]({elasticApmPackageLink}) package.',
+      ASP.NET Core monitoring or the [Elastic.Apm.EfCore]({efCorePackageLink}) package for just Entity Framework Core monitoring. \n\n In \
+      case you only want to use the public Agent API for manual instrumentation use the [Elastic.Apm]({elasticApmPackageLink}) package.',
         values: {
           allNuGetPackagesLink: 'https://www.nuget.org/packages?q=Elastic.apm',
           netCoreAllApmPackageLink:
diff --git a/x-pack/plugins/apm/server/tutorial/instructions/apm_server_instructions.ts b/x-pack/plugins/apm/common/tutorial/instructions/apm_server_instructions.ts
similarity index 100%
rename from x-pack/plugins/apm/server/tutorial/instructions/apm_server_instructions.ts
rename to x-pack/plugins/apm/common/tutorial/instructions/apm_server_instructions.ts
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
new file mode 100644
index 00000000000000..de9c7f651019e9
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
@@ -0,0 +1,205 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiAccordion,
+  EuiSpacer,
+  EuiText,
+  EuiCodeBlock,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { CreateAgentInstructions } from './agent_instructions_mappings';
+import {
+  Markdown,
+  useKibana,
+} from '../../../../../../../src/plugins/kibana_react/public';
+import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
+import { AgentIcon } from '../../shared/agent_icon';
+import { NewPackagePolicy } from '../apm_policy_form/typings';
+import { getCommands } from '../../../tutorial/config_agent/commands/get_commands';
+import { CopyCommands } from '../../../tutorial/config_agent/copy_commands';
+import { replaceTemplateStrings } from './replace_template_strings';
+
+function AccordionButtonContent({
+  agentName,
+  title,
+}: {
+  agentName: AgentName;
+  title: string;
+}) {
+  return (
+    <EuiFlexGroup justifyContent="flexStart" alignItems="center">
+      <EuiFlexItem grow={false}>
+        <AgentIcon size="xl" agentName={agentName} />
+      </EuiFlexItem>
+      <EuiFlexItem grow={1}>
+        <EuiFlexGroup direction="column" gutterSize="none">
+          <EuiFlexItem>
+            <EuiText>
+              <h4>{title}</h4>
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiText size="s">
+              <p>
+                {i18n.translate(
+                  'xpack.apm.fleet_integration.settings.apmAgent.description',
+                  {
+                    defaultMessage:
+                      'Configure instrumentation for {title} applications.',
+                    values: { title },
+                  }
+                )}
+              </p>
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
+
+function InstructionsContent({ markdown }: { markdown: string }) {
+  return (
+    <Markdown
+      className="euiText"
+      markdown={markdown}
+      openLinksInNewTab={true}
+      whiteListedRules={['backticks', 'emphasis', 'link', 'list']}
+    />
+  );
+}
+
+function TutorialConfigAgent({
+  variantId,
+  apmServerUrl,
+  secretToken,
+}: {
+  variantId: string;
+  apmServerUrl?: string;
+  secretToken?: string;
+}) {
+  const commandBlock = getCommands({
+    variantId,
+    policyDetails: { apmServerUrl, secretToken },
+  });
+  return (
+    <EuiFlexGroup direction="column" gutterSize="s">
+      <EuiFlexItem style={{ marginLeft: 'auto' }}>
+        <CopyCommands commands={commandBlock} />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <EuiCodeBlock language="bash">{commandBlock}</EuiCodeBlock>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
+
+interface Props {
+  newPolicy: NewPackagePolicy;
+  agentName: AgentName;
+  title: string;
+  variantId: string;
+  createAgentInstructions: CreateAgentInstructions;
+}
+
+export function AgentInstructionsAccordion({
+  newPolicy,
+  agentName,
+  title,
+  createAgentInstructions,
+  variantId,
+}: Props) {
+  const docLinks = useKibana().services.docLinks;
+  const vars = newPolicy?.inputs?.[0]?.vars;
+  const apmServerUrl = vars?.url.value;
+  const secretToken = vars?.secret_token.value;
+  const steps = createAgentInstructions(apmServerUrl, secretToken);
+  return (
+    <EuiAccordion
+      id={agentName}
+      buttonContent={
+        <AccordionButtonContent agentName={agentName} title={title} />
+      }
+    >
+      <EuiSpacer />
+      {steps.map(
+        (
+          {
+            title: stepTitle,
+            textPre,
+            textPost,
+            customComponentName,
+            commands,
+          },
+          index
+        ) => {
+          const commandBlock = replaceTemplateStrings(
+            Array.isArray(commands) ? commands.join('\n') : commands || '',
+            docLinks
+          );
+          return (
+            <section key={index}>
+              <EuiText>
+                <h4>{stepTitle}</h4>
+              </EuiText>
+              <EuiSpacer size="s" />
+              <EuiText color="subdued" size="s">
+                {textPre && (
+                  <EuiFlexGroup justifyContent="spaceBetween">
+                    <EuiFlexItem grow={false}>
+                      <InstructionsContent
+                        markdown={replaceTemplateStrings(textPre, docLinks)}
+                      />
+                    </EuiFlexItem>
+                    {commandBlock && (
+                      <EuiFlexItem grow={false}>
+                        <CopyCommands commands={commandBlock} />
+                      </EuiFlexItem>
+                    )}
+                  </EuiFlexGroup>
+                )}
+                {commandBlock && (
+                  <>
+                    <EuiSpacer size="s" />
+                    <EuiCodeBlock language="bash">{commandBlock}</EuiCodeBlock>
+                  </>
+                )}
+                {customComponentName === 'TutorialConfigAgent' && (
+                  <TutorialConfigAgent
+                    variantId={variantId}
+                    apmServerUrl={apmServerUrl}
+                    secretToken={secretToken}
+                  />
+                )}
+                {customComponentName === 'TutorialConfigAgentRumScript' && (
+                  <TutorialConfigAgent
+                    variantId="js_script"
+                    apmServerUrl={apmServerUrl}
+                    secretToken={secretToken}
+                  />
+                )}
+                {textPost && (
+                  <>
+                    <EuiSpacer />
+                    <InstructionsContent
+                      markdown={replaceTemplateStrings(textPost, docLinks)}
+                    />
+                  </>
+                )}
+              </EuiText>
+              <EuiSpacer />
+            </section>
+          );
+        }
+      )}
+    </EuiAccordion>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_mappings.ts b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_mappings.ts
new file mode 100644
index 00000000000000..8bfdafe61d44e4
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_mappings.ts
@@ -0,0 +1,99 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  createDotNetAgentInstructions,
+  createDjangoAgentInstructions,
+  createFlaskAgentInstructions,
+  createGoAgentInstructions,
+  createJavaAgentInstructions,
+  createJsAgentInstructions,
+  createNodeAgentInstructions,
+  createPhpAgentInstructions,
+  createRailsAgentInstructions,
+  createRackAgentInstructions,
+} from '../../../../common/tutorial/instructions/apm_agent_instructions';
+import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
+
+export type CreateAgentInstructions = (
+  apmServerUrl?: string,
+  secretToken?: string
+) => Array<{
+  title: string;
+  textPre?: string;
+  commands?: string[];
+  textPost?: string;
+  customComponentName?: string;
+}>;
+
+export const ApmAgentInstructionsMappings: Array<{
+  agentName: AgentName;
+  title: string;
+  variantId: string;
+  createAgentInstructions: CreateAgentInstructions;
+}> = [
+  {
+    agentName: 'java',
+    title: 'Java',
+    variantId: 'java',
+    createAgentInstructions: createJavaAgentInstructions,
+  },
+  {
+    agentName: 'rum-js',
+    title: 'JavaScript (Real User Monitoring)',
+    variantId: 'js',
+    createAgentInstructions: createJsAgentInstructions,
+  },
+  {
+    agentName: 'nodejs',
+    title: 'Node.js',
+    variantId: 'node',
+    createAgentInstructions: createNodeAgentInstructions,
+  },
+  {
+    agentName: 'python',
+    title: 'Django',
+    variantId: 'django',
+    createAgentInstructions: createDjangoAgentInstructions,
+  },
+  {
+    agentName: 'python',
+    title: 'Flask',
+    variantId: 'flask',
+    createAgentInstructions: createFlaskAgentInstructions,
+  },
+  {
+    agentName: 'ruby',
+    title: 'Ruby on Rails',
+    variantId: 'rails',
+    createAgentInstructions: createRailsAgentInstructions,
+  },
+  {
+    agentName: 'ruby',
+    title: 'Rack',
+    variantId: 'rack',
+    createAgentInstructions: createRackAgentInstructions,
+  },
+  {
+    agentName: 'go',
+    title: 'Go',
+    variantId: 'go',
+    createAgentInstructions: createGoAgentInstructions,
+  },
+  {
+    agentName: 'dotnet',
+    title: '.NET',
+    variantId: 'dotnet',
+    createAgentInstructions: createDotNetAgentInstructions,
+  },
+  {
+    agentName: 'php',
+    title: 'PHP',
+    variantId: 'php',
+    createAgentInstructions: createPhpAgentInstructions,
+  },
+];
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/index.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/index.tsx
new file mode 100644
index 00000000000000..d6a43a1e1268a6
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/index.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiPanel, EuiSpacer } from '@elastic/eui';
+import React, { Fragment } from 'react';
+import { AgentInstructionsAccordion } from './agent_instructions_accordion';
+import { ApmAgentInstructionsMappings } from './agent_instructions_mappings';
+import {
+  NewPackagePolicy,
+  PackagePolicy,
+  PackagePolicyEditExtensionComponentProps,
+} from '../apm_policy_form/typings';
+
+interface Props {
+  policy: PackagePolicy;
+  newPolicy: NewPackagePolicy;
+  onChange: PackagePolicyEditExtensionComponentProps['onChange'];
+}
+
+export function ApmAgents({ newPolicy }: Props) {
+  return (
+    <div>
+      {ApmAgentInstructionsMappings.map(
+        ({ agentName, title, createAgentInstructions, variantId }) => (
+          <Fragment key={agentName}>
+            <EuiPanel>
+              <AgentInstructionsAccordion
+                agentName={agentName}
+                title={title}
+                newPolicy={newPolicy}
+                createAgentInstructions={createAgentInstructions}
+                variantId={variantId}
+              />
+            </EuiPanel>
+            <EuiSpacer />
+          </Fragment>
+        )
+      )}
+    </div>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/replace_template_strings.ts b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/replace_template_strings.ts
new file mode 100644
index 00000000000000..2e0c0da8d0fb72
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/replace_template_strings.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CoreStart } from 'kibana/public';
+import Mustache from 'mustache';
+
+const TEMPLATE_TAGS = ['{', '}'];
+
+export function replaceTemplateStrings(
+  text: string,
+  docLinks?: CoreStart['docLinks']
+) {
+  Mustache.parse(text, TEMPLATE_TAGS);
+  return Mustache.render(text, {
+    curlyOpen: '{',
+    curlyClose: '}',
+    config: {
+      docs: {
+        base_url: docLinks?.ELASTIC_WEBSITE_URL,
+        version: docLinks?.DOC_LINK_VERSION,
+      },
+    },
+  });
+}
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
new file mode 100644
index 00000000000000..e1fb6dee9ca96a
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { lazy } from 'react';
+import { PackagePolicyEditExtensionComponent } from '../../../../fleet/public';
+
+export const getLazyApmAgentsTabExtension = () => {
+  return lazy<PackagePolicyEditExtensionComponent>(async () => {
+    const { ApmAgents } = await import('./apm_agents');
+    return { default: ApmAgents };
+  });
+};
diff --git a/x-pack/plugins/apm/public/components/shared/agent_icon/index.tsx b/x-pack/plugins/apm/public/components/shared/agent_icon/index.tsx
index a91ddb49d5e8f2..b995e2bbe7cfab 100644
--- a/x-pack/plugins/apm/public/components/shared/agent_icon/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/agent_icon/index.tsx
@@ -6,19 +6,20 @@
  */
 
 import React from 'react';
-import { EuiIcon } from '@elastic/eui';
+import { EuiIcon, EuiIconProps } from '@elastic/eui';
 import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
 import { getAgentIcon } from './get_agent_icon';
 import { useTheme } from '../../../hooks/use_theme';
 
 interface Props {
   agentName?: AgentName;
+  size?: EuiIconProps['size'];
 }
 
 export function AgentIcon(props: Props) {
-  const { agentName } = props;
+  const { agentName, size = 'l' } = props;
   const theme = useTheme();
   const icon = getAgentIcon(agentName, theme.darkMode);
 
-  return <EuiIcon type={icon} size="l" title={agentName} />;
+  return <EuiIcon type={icon} size={size} title={agentName} />;
 }
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 1644e5ceed8eec..c884f228c85d2e 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -52,6 +52,7 @@ import {
 } from './components/fleet_integration';
 import { getLazyAPMPolicyCreateExtension } from './components/fleet_integration/lazy_apm_policy_create_extension';
 import { getLazyAPMPolicyEditExtension } from './components/fleet_integration/lazy_apm_policy_edit_extension';
+import { getLazyApmAgentsTabExtension } from './components/fleet_integration/lazy_apm_agents_tab_extension';
 
 export type ApmPluginSetup = ReturnType<ApmPlugin['setup']>;
 
@@ -365,6 +366,14 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
         view: 'package-policy-edit',
         Component: getLazyAPMPolicyEditExtension(),
       });
+
+      fleet.registerExtension({
+        package: 'apm',
+        view: 'package-policy-edit-tabs',
+        tabs: [
+          { title: 'APM Agents', Component: getLazyApmAgentsTabExtension() },
+        ],
+      });
     }
   }
 }
diff --git a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
index a595ae1dc8a8b6..a7efaa3b00f345 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
@@ -23,7 +23,7 @@ import {
   createJavaAgentInstructions,
   createDotNetAgentInstructions,
   createPhpAgentInstructions,
-} from '../instructions/apm_agent_instructions';
+} from '../../../common/tutorial/instructions/apm_agent_instructions';
 import { CloudSetup } from '../../../../cloud/server';
 
 export function createElasticCloudInstructions(
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
index 400da79e3d2d06..38c8dbfcbe8bac 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -21,7 +21,7 @@ import {
   createPhpAgentInstructions,
   createRackAgentInstructions,
   createRailsAgentInstructions,
-} from '../instructions/apm_agent_instructions';
+} from '../../../common/tutorial/instructions/apm_agent_instructions';
 import {
   createDownloadServerDeb,
   createDownloadServerOsx,
@@ -30,7 +30,7 @@ import {
   createStartServerUnix,
   createStartServerUnixSysv,
   createWindowsServerInstructions,
-} from '../instructions/apm_server_instructions';
+} from '../../../common/tutorial/instructions/apm_server_instructions';
 
 export function onPremInstructions({
   errorIndices,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
index a712563966e0bd..646a2d3aa3583e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
@@ -153,7 +153,7 @@ exports[`Storyshots renderers/TimeFilter with absolute time bounds 1`] = `
                     data-test-subj="superDatePickerstartDatePopoverButton"
                     disabled={false}
                     onClick={[Function]}
-                    title="01/01/2019"
+                    title="~ 5 months ago"
                   >
                     ~ 5 months ago
                   </button>
@@ -180,7 +180,7 @@ exports[`Storyshots renderers/TimeFilter with absolute time bounds 1`] = `
                     data-test-subj="superDatePickerendDatePopoverButton"
                     disabled={false}
                     onClick={[Function]}
-                    title="12/31/2019"
+                    title="~ in 7 months"
                   >
                     ~ in 7 months
                   </button>
@@ -430,7 +430,7 @@ exports[`Storyshots renderers/TimeFilter with relative time bounds 1`] = `
                     data-test-subj="superDatePickerstartDatePopoverButton"
                     disabled={false}
                     onClick={[Function]}
-                    title="now/w"
+                    title="~ 6 days ago"
                   >
                     ~ 6 days ago
                   </button>
@@ -457,7 +457,7 @@ exports[`Storyshots renderers/TimeFilter with relative time bounds 1`] = `
                     data-test-subj="superDatePickerendDatePopoverButton"
                     disabled={false}
                     onClick={[Function]}
-                    title="now/w"
+                    title="~ in a day"
                   >
                     ~ in a day
                   </button>
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx
index 7b091e699b6172..13120b2b46dbeb 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx
@@ -39,8 +39,7 @@ export const WelcomeContent: FC = () => {
           <p>
             <FormattedMessage
               id="xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileDescription"
-              defaultMessage="The File Data Visualizer helps you understand the fields and metrics in a log file.
-              Upload your file, analyze its data, and then choose whether to import the data into an Elasticsearch index."
+              defaultMessage="Upload your file, analyze its data, and optionally import the data into an Elasticsearch index."
             />
           </p>
         </EuiText>
@@ -49,7 +48,7 @@ export const WelcomeContent: FC = () => {
           <p>
             <FormattedMessage
               id="xpack.dataVisualizer.file.welcomeContent.supportedFileFormatDescription"
-              defaultMessage="The File Data Visualizer supports these file formats:"
+              defaultMessage="The following file formats are supported:"
             />
           </p>
         </EuiText>
diff --git a/x-pack/plugins/enterprise_search/README.md b/x-pack/plugins/enterprise_search/README.md
index ca8ee68c42a34f..5c8d767de30997 100644
--- a/x-pack/plugins/enterprise_search/README.md
+++ b/x-pack/plugins/enterprise_search/README.md
@@ -66,6 +66,89 @@ sh jest.sh public/applications/shared/flash_messages/flash_messages_logic.test.t
 
 ### E2E tests
 
+We currently have two testing libraries in which we run E2E tests:
+
+- [Cypress](#cypress-tests)
+  - Will contain the majority of our happy path E2E testing
+- [Kibana's Functional Test Runner (FTR)](#kibana-ftr-tests)
+  - Contains basic tests that only run when the Enterprise Search host is not configured
+  - It's likely we will not continue to expand these tests, and might even trim some over time (to be replaced by Cypress)
+
+#### Cypress tests
+
+Documentation: https://docs.cypress.io/
+
+Cypress tests can be run directly from the `x-pack/plugins/enterprise_search` folder. You can use our handy cypress.sh script to run specific product test suites:
+
+```bash
+# Basic syntax
+sh cypress.sh {run|open} {suite}
+
+# Examples
+sh cypress.sh run overview   # run Enterprise Search overview tests
+sh cypress.sh open overview  # open Enterprise Search overview tests
+
+sh cypress.sh run as         # run App Search tests
+sh cypress.sh open as        # open App Search tests
+
+sh cypress.sh run ws         # run Workplace Search tests
+sh cypress.sh open ws        # open Workplace Search tests
+
+# Overriding env variables
+sh cypress.sh open as --env username=enterprise_search password=123
+
+# Overriding config settings, e.g. changing the base URL to a dev path, or enabling video recording
+sh cypress.sh open as --config baseUrl=http://localhost:5601/xyz video=true
+
+# Only run a single specific test file
+sh cypress.sh run ws --spec '**/example.spec.ts'
+
+# Opt to run Chrome headlessly
+sh cypress.sh run ws --headless
+```
+
+There are 3 ways you can spin up the required environments to run our Cypress tests:
+
+1. Running Cypress against local dev environments:
+   - Elasticsearch:
+     - Start a local instance, or use Kibana's `yarn es snapshot` command (with all configurations/versions required to run Enterprise Search locally)
+     - NOTE: We generally recommend a fresh instance (or blowing away your `data/` folder) to reduce false negatives due to custom user data
+   - Kibana:
+     - You **must** have `csp.strict: false` and `csp.warnLegacyBrowsers: false` set in your `kibana.dev.yml`.
+     - You should either start Kibana with `yarn start --no-base-path` or pass `--config baseUrl=http://localhost:5601/xyz` into your Cypress command.
+   - Enterprise Search:
+     - Nothing extra is required to run Cypress tests, only what is already needed to run Kibana/Enterprise Search locally.
+2. Running Cypress against Kibana's functional test server:
+   - :information_source: While we won't use the runner, we can still make use of Kibana's functional test server to help us spin up Elasticsearch and Kibana instances.
+     - NOTE: We recommend stopping any other local dev processes, to reduce issues with memory/performance
+   - From the `x-pack/` project folder, run `node scripts/functional_tests_server --config test/functional_enterprise_search/cypress.config.ts`
+   - Kibana:
+     - You will need to pass `--config baseUrl=http://localhost:5620` into your Cypress command.
+   - Enterprise Search:
+     - :warning: TODO: We _currently_ do not have a way of spinning up Enterprise Search from Kibana's FTR - for now, you can use local Enterprise Search (pointed at the FTR's `http://localhost:9220` Elasticsearch host instance)
+3. Running Cypress against Enterprise Search dockerized stack scripts
+   - :warning: This is for Enterprise Search devs only, as this requires access to our closed source Enterprise Search repo
+   - `stack_scripts/start-with-es-native-auth.sh --with-kibana`
+   - Note that the tradeoff of an easier one-command start experience is you will not be able to run Cypress tests against any local changes.
+
+##### Debugging
+
+Cypress can either run silently in a headless browser in the command line (`run` or `--headless` mode), which is the default mode used by CI, or opened interactively in an included app and the Chrome browser (`open` or `--headed --no-exit` mode).
+
+For debugging failures locally, we generally recommend using open mode, which allows you to run a single specific test suite, and makes browser dev tools available to you so you can pause and inspect DOM as needed.
+
+> :warning: Although this is more extra caution than a hard-and-fast rule, we generally recommend taking a break and not clicking or continuing to use the app while tests are running. This can eliminate or lower the possibility of hard-to-reproduce/intermittently flaky behavior and timeouts due to user interference.
+
+##### Artifacts
+
+All failed tests will output a screenshot to the `x-pack/plugins/enterprise_search/target/cypress/screenshots` folder. We strongly recommend starting there for debugging failed tests to inspect error messages and UI state at point of failure.
+
+To track what Cypress is doing while running tests, you can pass in `--config video=true` which will output screencaptures to a `videos/` folder for all tests (both successful and failing). This can potentially provide more context leading up to the failure point, if a static screenshot isn't providing enough information.
+
+> :information_source: We have videos turned off in our config to reduce test runtime, especially on CI, but suggest re-enabling it for any deep debugging.
+
+#### Kibana FTR tests
+
 See [our functional test runner README](../../test/functional_enterprise_search).
 
 Our automated accessibility tests can be found in [x-pack/test/accessibility/apps](../../test/accessibility/apps/enterprise_search.ts).
diff --git a/x-pack/plugins/enterprise_search/cypress.sh b/x-pack/plugins/enterprise_search/cypress.sh
new file mode 100644
index 00000000000000..9dbdd81ab788f8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/cypress.sh
@@ -0,0 +1,18 @@
+#! /bin/bash
+
+# Use either `cypress run` or `cypress open` - defaults to run
+MODE="${1:-run}"
+
+# Choose which product folder to use, e.g. `yarn cypress open as`
+PRODUCT="${2}"
+# Provide helpful shorthands
+if [ "$PRODUCT" == "as" ]; then PRODUCT='app_search'; fi
+if [ "$PRODUCT" == "ws" ]; then PRODUCT='workplace_search'; fi
+if [ "$PRODUCT" == "overview" ]; then PRODUCT='enterprise_search'; fi
+
+# Pass all remaining arguments (e.g., ...rest) from the 3rd arg onwards
+# as an open-ended string. Appends onto to the end the Cypress command
+# @see https://docs.cypress.io/guides/guides/command-line.html#Options
+ARGS="${*:3}"
+
+../../../node_modules/.bin/cypress "$MODE" --project "public/applications/$PRODUCT" --browser chrome $ARGS
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/cypress.json b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress.json
new file mode 100644
index 00000000000000..766aaf6df36ada
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress.json
@@ -0,0 +1,20 @@
+{
+  "supportFile": "./cypress/support/commands.ts",
+  "pluginsFile": false,
+  "retries": {
+    "runMode": 2
+  },
+  "baseUrl": "http://localhost:5601",
+  "env": {
+    "username": "elastic",
+    "password": "changeme"
+  },
+  "screenshotsFolder": "../../../target/cypress/screenshots",
+  "videosFolder": "../../../target/cypress/videos",
+  "defaultCommandTimeout": 120000,
+  "execTimeout": 120000,
+  "pageLoadTimeout": 180000,
+  "viewportWidth": 1600,
+  "viewportHeight": 1200,
+  "video": false
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/integration/engines.spec.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/integration/engines.spec.ts
new file mode 100644
index 00000000000000..5e651aab075c64
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/integration/engines.spec.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { login } from '../support/commands';
+
+context('Engines', () => {
+  beforeEach(() => {
+    login();
+  });
+
+  it('renders', () => {
+    cy.contains('Engines');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/support/commands.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/support/commands.ts
new file mode 100644
index 00000000000000..50b5fcd1792976
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/support/commands.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { login as baseLogin } from '../../../shared/cypress/commands';
+import { appSearchPath } from '../../../shared/cypress/routes';
+
+interface Login {
+  path?: string;
+  username?: string;
+  password?: string;
+}
+export const login = ({ path = '/', ...args }: Login = {}) => {
+  baseLogin({ ...args });
+  cy.visit(`${appSearchPath}${path}`);
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/tsconfig.json b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/tsconfig.json
new file mode 100644
index 00000000000000..40361607aa3c5b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/cypress/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../shared/cypress/tsconfig.json",
+  "references": [{ "path": "../../shared/cypress/tsconfig.json" }],
+  "compilerOptions": { "outDir": "../../../../target/cypress/types/app_search" },
+  "include": ["./**/*"]
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress.json b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress.json
new file mode 100644
index 00000000000000..8ca8bdfd79a49b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress.json
@@ -0,0 +1,21 @@
+{
+  "supportFile": false,
+  "pluginsFile": false,
+  "retries": {
+    "runMode": 2
+  },
+  "baseUrl": "http://localhost:5601",
+  "env": {
+    "username": "elastic",
+    "password": "changeme"
+  },
+  "fixturesFolder": false,
+  "screenshotsFolder": "../../../target/cypress/screenshots",
+  "videosFolder": "../../../target/cypress/videos",
+  "defaultCommandTimeout": 120000,
+  "execTimeout": 120000,
+  "pageLoadTimeout": 180000,
+  "viewportWidth": 1600,
+  "viewportHeight": 1200,
+  "video": false
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/integration/overview.spec.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/integration/overview.spec.ts
new file mode 100644
index 00000000000000..4c9a159a6736f2
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/integration/overview.spec.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { login } from '../../../shared/cypress/commands';
+import { overviewPath } from '../../../shared/cypress/routes';
+
+context('Enterprise Search Overview', () => {
+  beforeEach(() => {
+    login();
+  });
+
+  it('should contain product cards', () => {
+    cy.visit(overviewPath);
+    cy.contains('Welcome to Elastic Enterprise Search');
+
+    cy.get('[data-test-subj="appSearchProductCard"]')
+      .contains('Open App Search')
+      .should('have.attr', 'href')
+      .and('match', /app_search/);
+
+    cy.get('[data-test-subj="workplaceSearchProductCard"]')
+      .contains('Open Workplace Search')
+      .should('have.attr', 'href')
+      .and('match', /workplace_search/);
+  });
+
+  it('should have a setup guide', () => {
+    // @see https://github.com/quasarframework/quasar/issues/2233#issuecomment-492975745
+    // This only appears to occur for setup guides - I haven't (yet?) run into it on other pages
+    cy.on('uncaught:exception', (err) => {
+      if (err.message.includes('> ResizeObserver loop limit exceeded')) return false;
+    });
+
+    cy.visit(`${overviewPath}/setup_guide`);
+    cy.contains('Setup Guide');
+    cy.contains('Add your Enterprise Search host URL to your Kibana configuration');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/tsconfig.json b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/tsconfig.json
new file mode 100644
index 00000000000000..fd75825bd3e265
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../shared/cypress/tsconfig.json",
+  "references": [{ "path": "../../shared/cypress/tsconfig.json" }],
+  "compilerOptions": { "outDir": "../../../../target/cypress/types/enterprise_search" },
+  "include": ["./**/*"]
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/cypress/commands.ts b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/commands.ts
new file mode 100644
index 00000000000000..5f9738fae50646
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/commands.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * Shared non-product-specific commands
+ */
+
+/*
+ * Log in a user via XHR
+ * @see https://docs.cypress.io/guides/getting-started/testing-your-app#Logging-in
+ */
+interface Login {
+  username?: string;
+  password?: string;
+}
+export const login = ({
+  username = Cypress.env('username'),
+  password = Cypress.env('password'),
+}: Login = {}) => {
+  cy.request({
+    method: 'POST',
+    url: '/internal/security/login',
+    headers: { 'kbn-xsrf': 'cypress' },
+    body: {
+      providerType: 'basic',
+      providerName: 'basic',
+      currentURL: '/',
+      params: { username, password },
+    },
+  });
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts
new file mode 100644
index 00000000000000..b1a0aaba956612
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/routes.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const overviewPath = '/app/enterprise_search/overview';
+export const appSearchPath = '/app/enterprise_search/app_search';
+export const workplaceSearchPath = '/app/enterprise_search/workplace_search';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/cypress/tsconfig.json b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/tsconfig.json
new file mode 100644
index 00000000000000..be8ccac5f5e72f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/cypress/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../../../../../../../tsconfig.base.json",
+  "include": ["./**/*"],
+  "compilerOptions": {
+    "outDir": "../../../../target/cypress/types/shared",
+    "types": ["cypress", "node"]
+  }
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress.json b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress.json
new file mode 100644
index 00000000000000..766aaf6df36ada
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress.json
@@ -0,0 +1,20 @@
+{
+  "supportFile": "./cypress/support/commands.ts",
+  "pluginsFile": false,
+  "retries": {
+    "runMode": 2
+  },
+  "baseUrl": "http://localhost:5601",
+  "env": {
+    "username": "elastic",
+    "password": "changeme"
+  },
+  "screenshotsFolder": "../../../target/cypress/screenshots",
+  "videosFolder": "../../../target/cypress/videos",
+  "defaultCommandTimeout": 120000,
+  "execTimeout": 120000,
+  "pageLoadTimeout": 180000,
+  "viewportWidth": 1600,
+  "viewportHeight": 1200,
+  "video": false
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/integration/overview.spec.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/integration/overview.spec.ts
new file mode 100644
index 00000000000000..8ce6e4ebcfb05a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/integration/overview.spec.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { login } from '../support/commands';
+
+context('Overview', () => {
+  beforeEach(() => {
+    login();
+  });
+
+  it('renders', () => {
+    cy.contains('Workplace Search');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/support/commands.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/support/commands.ts
new file mode 100644
index 00000000000000..d91b73fd78c051
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/support/commands.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { login as baseLogin } from '../../../shared/cypress/commands';
+import { workplaceSearchPath } from '../../../shared/cypress/routes';
+
+interface Login {
+  path?: string;
+  username?: string;
+  password?: string;
+}
+export const login = ({ path = '/', ...args }: Login = {}) => {
+  baseLogin({ ...args });
+  cy.visit(`${workplaceSearchPath}${path}`);
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/tsconfig.json b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/tsconfig.json
new file mode 100644
index 00000000000000..39f8bea5debc64
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../shared/cypress/tsconfig.json",
+  "references": [{ "path": "../../shared/cypress/tsconfig.json" }],
+  "compilerOptions": { "outDir": "../../../../target/cypress/types/workplace_search" },
+  "include": ["./**/*"]
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.test.tsx
index 5ed777322cc08b..a8a5810e7c0a23 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.test.tsx
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
+
 import React from 'react';
 
 import { shallow } from 'enzyme';
@@ -13,6 +15,8 @@ import { EuiLink, EuiPanel, EuiTitle } from '@elastic/eui';
 
 import { EuiLinkTo } from '../../../../../shared/react_router_helpers';
 
+import { LicenseBadge } from '../../../../components/shared/license_badge';
+
 import { SaveCustom } from './save_custom';
 
 describe('SaveCustom', () => {
@@ -28,11 +32,19 @@ describe('SaveCustom', () => {
     header: <h1>Header</h1>,
   };
   it('renders', () => {
+    setMockValues({ hasPlatinumLicense: true });
     const wrapper = shallow(<SaveCustom {...props} />);
 
     expect(wrapper.find(EuiPanel)).toHaveLength(1);
     expect(wrapper.find(EuiTitle)).toHaveLength(5);
     expect(wrapper.find(EuiLinkTo)).toHaveLength(1);
+  });
+
+  it('renders platinum LicenseBadge and link', () => {
+    setMockValues({ hasPlatinumLicense: false });
+    const wrapper = shallow(<SaveCustom {...props} />);
+
+    expect(wrapper.find(LicenseBadge)).toHaveLength(1);
     expect(wrapper.find(EuiLink)).toHaveLength(1);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
index 9689ecfae4a94d..bbece2f68c7174 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
@@ -7,6 +7,8 @@
 
 import React from 'react';
 
+import { useValues } from 'kea';
+
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -22,6 +24,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
+import { LicensingLogic } from '../../../../../shared/licensing';
 import { EuiLinkTo } from '../../../../../shared/react_router_helpers';
 import { CredentialItem } from '../../../../components/shared/credential_item';
 import { LicenseBadge } from '../../../../components/shared/license_badge';
@@ -59,152 +62,157 @@ export const SaveCustom: React.FC<SaveCustomProps> = ({
   newCustomSource: { id, accessToken, name },
   isOrganization,
   header,
-}) => (
-  <>
-    {header}
-    <EuiSpacer />
-    <EuiFlexGroup direction="row">
-      <EuiFlexItem grow={2}>
-        <EuiPanel paddingSize="l" hasShadow={false} color="subdued">
-          <EuiFlexGroup direction="column" alignItems="center" responsive={false}>
-            <EuiFlexItem>
-              <EuiIcon type="checkInCircleFilled" color="#42CC89" size="xxl" />
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiTitle size="l">
-                <EuiTextAlign textAlign="center">
-                  <h1>
-                    {i18n.translate(
-                      'xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.heading',
-                      {
-                        defaultMessage: '{name} Created',
-                        values: { name },
-                      }
-                    )}
-                  </h1>
-                </EuiTextAlign>
-              </EuiTitle>
-              <EuiText grow={false}>
-                <EuiTextAlign textAlign="center">
-                  {SAVE_CUSTOM_BODY1}
-                  <br />
-                  {SAVE_CUSTOM_BODY2}
-                  <br />
-                  <EuiLinkTo to={getSourcesPath(SOURCES_PATH, isOrganization)}>
-                    {SAVE_CUSTOM_RETURN_BUTTON}
-                  </EuiLinkTo>
-                </EuiTextAlign>
-              </EuiText>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiHorizontalRule />
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              <EuiTitle size="xs">
-                <h4>{SAVE_CUSTOM_API_KEYS_TITLE}</h4>
-              </EuiTitle>
-              <EuiText grow={false} size="s" color="subdued">
-                <p>{SAVE_CUSTOM_API_KEYS_BODY}</p>
-              </EuiText>
+}) => {
+  const { hasPlatinumLicense } = useValues(LicensingLogic);
+  return (
+    <>
+      {header}
+      <EuiSpacer />
+      <EuiFlexGroup direction="row">
+        <EuiFlexItem grow={2}>
+          <EuiPanel paddingSize="l" hasShadow={false} color="subdued">
+            <EuiFlexGroup direction="column" alignItems="center" responsive={false}>
+              <EuiFlexItem>
+                <EuiIcon type="checkInCircleFilled" color="#42CC89" size="xxl" />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiTitle size="l">
+                  <EuiTextAlign textAlign="center">
+                    <h1>
+                      {i18n.translate(
+                        'xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.heading',
+                        {
+                          defaultMessage: '{name} Created',
+                          values: { name },
+                        }
+                      )}
+                    </h1>
+                  </EuiTextAlign>
+                </EuiTitle>
+                <EuiText grow={false}>
+                  <EuiTextAlign textAlign="center">
+                    {SAVE_CUSTOM_BODY1}
+                    <br />
+                    {SAVE_CUSTOM_BODY2}
+                    <br />
+                    <EuiLinkTo to={getSourcesPath(SOURCES_PATH, isOrganization)}>
+                      {SAVE_CUSTOM_RETURN_BUTTON}
+                    </EuiLinkTo>
+                  </EuiTextAlign>
+                </EuiText>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+            <EuiHorizontalRule />
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiTitle size="xs">
+                  <h4>{SAVE_CUSTOM_API_KEYS_TITLE}</h4>
+                </EuiTitle>
+                <EuiText grow={false} size="s" color="subdued">
+                  <p>{SAVE_CUSTOM_API_KEYS_BODY}</p>
+                </EuiText>
+                <EuiSpacer />
+                <CredentialItem label={ID_LABEL} value={id} testSubj="ContentSourceId" />
+                <EuiSpacer />
+                <CredentialItem
+                  label={ACCESS_TOKEN_LABEL}
+                  value={accessToken}
+                  testSubj="AccessToken"
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem grow={1}>
+          <EuiFlexGroup justifyContent="flexStart" alignItems="flexStart" responsive={false}>
+            <EuiFlexItem grow={false}>
+              <EuiSpacer size="s" />
+              <div>
+                <EuiTitle size="xs">
+                  <h4>{SAVE_CUSTOM_VISUAL_WALKTHROUGH_TITLE}</h4>
+                </EuiTitle>
+                <EuiSpacer size="xs" />
+                <EuiText color="subdued" size="s">
+                  <p>
+                    <FormattedMessage
+                      id="xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.documentation.text"
+                      defaultMessage="{link} to learn more about Custom API Sources."
+                      values={{
+                        link: (
+                          <EuiLink target="_blank" href={documentationUrl}>
+                            Check out the documentation
+                          </EuiLink>
+                        ),
+                      }}
+                    />
+                  </p>
+                </EuiText>
+              </div>
               <EuiSpacer />
-              <CredentialItem label={ID_LABEL} value={id} testSubj="ContentSourceId" />
+              <div>
+                <EuiTitle size="xs">
+                  <h4>{SAVE_CUSTOM_STYLING_RESULTS_TITLE}</h4>
+                </EuiTitle>
+                <EuiSpacer size="xs" />
+                <EuiText color="subdued" size="s">
+                  <p>
+                    <FormattedMessage
+                      id="xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.displaySettings.text"
+                      defaultMessage="Use {link} to customize how your documents will appear within your search results. Workplace Search will use fields in alphabetical order by default."
+                      values={{
+                        link: (
+                          <EuiLinkTo
+                            to={getContentSourcePath(
+                              SOURCE_DISPLAY_SETTINGS_PATH,
+                              id,
+                              isOrganization
+                            )}
+                          >
+                            Display Settings
+                          </EuiLinkTo>
+                        ),
+                      }}
+                    />
+                  </p>
+                </EuiText>
+              </div>
               <EuiSpacer />
-              <CredentialItem
-                label={ACCESS_TOKEN_LABEL}
-                value={accessToken}
-                testSubj="AccessToken"
-              />
+              <div>
+                <EuiSpacer size="s" />
+                {!hasPlatinumLicense && <LicenseBadge />}
+                <EuiSpacer size="s" />
+                <EuiTitle size="xs">
+                  <h4>{SAVE_CUSTOM_DOC_PERMISSIONS_TITLE}</h4>
+                </EuiTitle>
+                <EuiSpacer size="xs" />
+                <EuiText color="subdued" size="s">
+                  <p>
+                    <FormattedMessage
+                      id="xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.permissions.text"
+                      defaultMessage="{link} manage content access content on individual or group attributes. Allow or deny access to specific documents."
+                      values={{
+                        link: (
+                          <EuiLink target="_blank" href={CUSTOM_API_DOCUMENT_PERMISSIONS_DOCS_URL}>
+                            Document-level permissions
+                          </EuiLink>
+                        ),
+                      }}
+                    />
+                  </p>
+                </EuiText>
+                <EuiSpacer size="xs" />
+                {!hasPlatinumLicense && (
+                  <EuiText size="s">
+                    <EuiLink target="_blank" href={ENT_SEARCH_LICENSE_MANAGEMENT}>
+                      {LEARN_CUSTOM_FEATURES_BUTTON}
+                    </EuiLink>
+                  </EuiText>
+                )}
+              </div>
             </EuiFlexItem>
           </EuiFlexGroup>
-        </EuiPanel>
-      </EuiFlexItem>
-      <EuiFlexItem grow={1}>
-        <EuiFlexGroup justifyContent="flexStart" alignItems="flexStart" responsive={false}>
-          <EuiFlexItem grow={false}>
-            <EuiSpacer size="s" />
-            <div>
-              <EuiTitle size="xs">
-                <h4>{SAVE_CUSTOM_VISUAL_WALKTHROUGH_TITLE}</h4>
-              </EuiTitle>
-              <EuiSpacer size="xs" />
-              <EuiText color="subdued" size="s">
-                <p>
-                  <FormattedMessage
-                    id="xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.documentation.text"
-                    defaultMessage="{link} to learn more about Custom API Sources."
-                    values={{
-                      link: (
-                        <EuiLink target="_blank" href={documentationUrl}>
-                          Check out the documentation
-                        </EuiLink>
-                      ),
-                    }}
-                  />
-                </p>
-              </EuiText>
-            </div>
-            <EuiSpacer />
-            <div>
-              <EuiTitle size="xs">
-                <h4>{SAVE_CUSTOM_STYLING_RESULTS_TITLE}</h4>
-              </EuiTitle>
-              <EuiSpacer size="xs" />
-              <EuiText color="subdued" size="s">
-                <p>
-                  <FormattedMessage
-                    id="xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.displaySettings.text"
-                    defaultMessage="Use {link} to customize how your documents will appear within your search results. Workplace Search will use fields in alphabetical order by default."
-                    values={{
-                      link: (
-                        <EuiLinkTo
-                          to={getContentSourcePath(
-                            SOURCE_DISPLAY_SETTINGS_PATH,
-                            id,
-                            isOrganization
-                          )}
-                        >
-                          Display Settings
-                        </EuiLinkTo>
-                      ),
-                    }}
-                  />
-                </p>
-              </EuiText>
-            </div>
-            <EuiSpacer />
-            <div>
-              <EuiSpacer size="s" />
-              <LicenseBadge />
-              <EuiSpacer size="s" />
-              <EuiTitle size="xs">
-                <h4>{SAVE_CUSTOM_DOC_PERMISSIONS_TITLE}</h4>
-              </EuiTitle>
-              <EuiSpacer size="xs" />
-              <EuiText color="subdued" size="s">
-                <p>
-                  <FormattedMessage
-                    id="xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.permissions.text"
-                    defaultMessage="{link} manage content access content on individual or group attributes. Allow or deny access to specific documents."
-                    values={{
-                      link: (
-                        <EuiLink target="_blank" href={CUSTOM_API_DOCUMENT_PERMISSIONS_DOCS_URL}>
-                          Document-level permissions
-                        </EuiLink>
-                      ),
-                    }}
-                  />
-                </p>
-              </EuiText>
-              <EuiSpacer size="xs" />
-              <EuiText size="s">
-                <EuiLink target="_blank" href={ENT_SEARCH_LICENSE_MANAGEMENT}>
-                  {LEARN_CUSTOM_FEATURES_BUTTON}
-                </EuiLink>
-              </EuiText>
-            </div>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </>
-);
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/tsconfig.json b/x-pack/plugins/enterprise_search/tsconfig.json
index 481c4527d59777..ce288f8b4b97d6 100644
--- a/x-pack/plugins/enterprise_search/tsconfig.json
+++ b/x-pack/plugins/enterprise_search/tsconfig.json
@@ -6,6 +6,7 @@
     "declaration": true,
     "declarationMap": true
   },
+  "exclude": ["public/applications/**/cypress/**/*"],
   "include": [
     "common/**/*",
     "public/**/*",
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index e2de2c412e828d..1a3065cb4518d5 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -44,6 +44,7 @@ export const INDEX_SOURCE_API_PATH = `${GIS_API_PATH}/docSource`;
 export const API_ROOT_PATH = `/${GIS_API_PATH}`;
 export const INDEX_FEATURE_PATH = `/${GIS_API_PATH}/feature`;
 export const GET_MATCHING_INDEXES_PATH = `/${GIS_API_PATH}/getMatchingIndexes`;
+export const CHECK_IS_DRAWING_INDEX = `/${GIS_API_PATH}/checkIsDrawingIndex`;
 
 export const MVT_GETTILE_API_PATH = 'mvt/getTile';
 export const MVT_GETGRIDTILE_API_PATH = 'mvt/getGridTile';
@@ -310,7 +311,7 @@ export type RawValue = string | string[] | number | boolean | undefined | null;
 
 export type FieldFormatter = (value: RawValue) => string | number;
 
-export const INDEX_META_DATA_CREATED_BY = 'maps-drawing-data-ingest';
+export const MAPS_NEW_VECTOR_LAYER_META_CREATED_BY = 'maps-new-vector-layer';
 
 export const MAX_DRAWING_SIZE_BYTES = 10485760; // 10MB
 
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index aa643b431721c3..1cccfaa7748b1f 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -26,7 +26,8 @@
   "optionalPlugins": [
     "home",
     "savedObjectsTagging",
-    "charts"
+    "charts",
+    "security"
   ],
   "ui": true,
   "server": true,
diff --git a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/create_new_index_pattern.ts b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/create_new_index_pattern.ts
index d612c25157095f..2e57014824a3c2 100644
--- a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/create_new_index_pattern.ts
+++ b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/create_new_index_pattern.ts
@@ -6,20 +6,30 @@
  */
 
 import { getHttp } from '../../../kibana_services';
-import { CreateDocSourceResp, INDEX_SOURCE_API_PATH } from '../../../../common';
+import {
+  CreateDocSourceResp,
+  INDEX_SOURCE_API_PATH,
+  IndexSourceMappings,
+} from '../../../../common';
 
-export const createNewIndexAndPattern = async (indexName: string) => {
+export const createNewIndexAndPattern = async ({
+  indexName,
+  defaultMappings = {},
+}: {
+  indexName: string;
+  defaultMappings: IndexSourceMappings | {};
+}) => {
   return await getHttp().fetch<CreateDocSourceResp>({
     path: `/${INDEX_SOURCE_API_PATH}`,
     method: 'POST',
     body: JSON.stringify({
       index: indexName,
-      // Initially set to static mappings
       mappings: {
         properties: {
           coordinates: {
             type: 'geo_shape',
           },
+          ...defaultMappings,
         },
       },
     }),
diff --git a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx
index 4f9e9c39ce466a..6dac22581efdb3 100644
--- a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx
@@ -22,6 +22,19 @@ interface State {
   createIndexError: string;
 }
 
+const DEFAULT_MAPPINGS = {
+  created: {
+    properties: {
+      '@timestamp': {
+        type: 'date',
+      },
+      user: {
+        type: 'keyword',
+      },
+    },
+  },
+};
+
 export class NewVectorLayerEditor extends Component<RenderWizardArguments, State> {
   private _isMounted: boolean = false;
 
@@ -59,7 +72,10 @@ export class NewVectorLayerEditor extends Component<RenderWizardArguments, State
   _createNewIndex = async () => {
     let indexPatternId: string | undefined;
     try {
-      const response = await createNewIndexAndPattern(this.state.indexName);
+      const response = await createNewIndexAndPattern({
+        indexName: this.state.indexName,
+        defaultMappings: DEFAULT_MAPPINGS,
+      });
       indexPatternId = response.indexPatternId;
     } catch (e) {
       this._setCreateIndexError(e.message);
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
index 74a0ea1e638823..54e0c00141cd31 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
@@ -184,7 +184,6 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
   supportsFeatureEditing(): boolean {
     const dataRequest = this.getDataRequest(SUPPORTS_FEATURE_EDITING_REQUEST_ID);
     const data = dataRequest?.getData() as { supportsFeatureEditing: boolean } | undefined;
-
     return data ? data.supportsFeatureEditing : false;
   }
 
@@ -1116,7 +1115,8 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
 
   async addFeature(geometry: Geometry | Position[]) {
     const layerSource = this.getSource();
-    await layerSource.addFeature(geometry);
+    const defaultFields = await layerSource.getDefaultFields();
+    await layerSource.addFeature(geometry, defaultFields);
   }
 
   async deleteFeature(featureId: string) {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
index b63a821cdb0c79..464ba024663ece 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
@@ -13,7 +13,12 @@ import type { Filter, IFieldType, IndexPattern } from 'src/plugins/data/public';
 import { GeoJsonProperties, Geometry, Position } from 'geojson';
 import { esFilters } from '../../../../../../../src/plugins/data/public';
 import { AbstractESSource } from '../es_source';
-import { getHttp, getSearchService, getTimeFilter } from '../../../kibana_services';
+import {
+  getHttp,
+  getSearchService,
+  getSecurityService,
+  getTimeFilter,
+} from '../../../kibana_services';
 import {
   addFieldToDSL,
   getField,
@@ -62,7 +67,12 @@ import { isValidStringConfig } from '../../util/valid_string_config';
 import { TopHitsUpdateSourceEditor } from './top_hits';
 import { getDocValueAndSourceFields, ScriptField } from './util/get_docvalue_source_fields';
 import { ITiledSingleLayerMvtParams } from '../tiled_single_layer_vector_source/tiled_single_layer_vector_source';
-import { addFeatureToIndex, deleteFeatureFromIndex, getMatchingIndexes } from './util/feature_edit';
+import {
+  addFeatureToIndex,
+  deleteFeatureFromIndex,
+  getIsDrawLayer,
+  getMatchingIndexes,
+} from './util/feature_edit';
 
 export function timerangeToTimeextent(timerange: TimeRange): Timeslice | undefined {
   const timeRangeBounds = getTimeFilter().calculateBounds(timerange);
@@ -444,6 +454,29 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
     return matchingIndexes.length === 1;
   }
 
+  async getDefaultFields(): Promise<Record<string, Record<string, string>>> {
+    if (!(await this._isDrawingIndex())) {
+      return {};
+    }
+    const user = await getSecurityService()?.authc.getCurrentUser();
+    const timestamp = new Date().toISOString();
+    return {
+      created: {
+        ...(user ? { user: user.username } : {}),
+        '@timestamp': timestamp,
+      },
+    };
+  }
+
+  async _isDrawingIndex(): Promise<boolean> {
+    await this.getIndexPattern();
+    if (!(this.indexPattern && this.indexPattern.title)) {
+      return false;
+    }
+    const { success, isDrawingIndex } = await getIsDrawLayer(this.indexPattern.title);
+    return success && isDrawingIndex;
+  }
+
   _hasSort(): boolean {
     const { sortField, sortOrder } = this._descriptor;
     return !!sortField && !!sortOrder;
@@ -716,9 +749,12 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
     return MVT_SOURCE_LAYER_NAME;
   }
 
-  async addFeature(geometry: Geometry | Position[]) {
+  async addFeature(
+    geometry: Geometry | Position[],
+    defaultFields: Record<string, Record<string, string>>
+  ) {
     const indexPattern = await this.getIndexPattern();
-    await addFeatureToIndex(indexPattern.title, geometry, this.getGeoFieldName());
+    await addFeatureToIndex(indexPattern.title, geometry, this.getGeoFieldName(), defaultFields);
   }
 
   async deleteFeature(featureId: string) {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/feature_edit.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/feature_edit.ts
index f306a225df69aa..c9a967bea3e2c3 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/feature_edit.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/feature_edit.ts
@@ -7,15 +7,20 @@
 
 import { Geometry, Position } from 'geojson';
 import { set } from '@elastic/safer-lodash-set';
-import { GET_MATCHING_INDEXES_PATH, INDEX_FEATURE_PATH } from '../../../../../common';
+import {
+  CHECK_IS_DRAWING_INDEX,
+  GET_MATCHING_INDEXES_PATH,
+  INDEX_FEATURE_PATH,
+} from '../../../../../common';
 import { getHttp } from '../../../../kibana_services';
 
 export const addFeatureToIndex = async (
   indexName: string,
   geometry: Geometry | Position[],
-  path: string
+  path: string,
+  defaultFields: Record<string, Record<string, string>>
 ) => {
-  const data = set({}, path, geometry);
+  const data = set({ ...defaultFields }, path, geometry);
   return await getHttp().fetch({
     path: `${INDEX_FEATURE_PATH}`,
     method: 'POST',
@@ -42,3 +47,11 @@ export const getMatchingIndexes = async (indexPattern: string) => {
     method: 'GET',
   });
 };
+
+export const getIsDrawLayer = async (index: string) => {
+  return await getHttp().fetch({
+    path: CHECK_IS_DRAWING_INDEX,
+    method: 'GET',
+    query: { index },
+  });
+};
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
index f825a85f50bbd1..6911cbabdf971a 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
@@ -239,6 +239,10 @@ export class MVTSingleLayerVectorSource
   async supportsFeatureEditing(): Promise<boolean> {
     return false;
   }
+
+  async getDefaultFields(): Promise<Record<string, Record<string, string>>> {
+    return {};
+  }
 }
 
 registerSource({
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
index 4dbf5f16b06735..9d02c21d00aaba 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
@@ -69,7 +69,11 @@ export interface IVectorSource extends ISource {
   getSourceTooltipContent(sourceDataRequest?: DataRequest): SourceTooltipConfig;
   getTimesliceMaskFieldName(): Promise<string | null>;
   supportsFeatureEditing(): Promise<boolean>;
-  addFeature(geometry: Geometry | Position[]): Promise<void>;
+  getDefaultFields(): Promise<Record<string, Record<string, string>>>;
+  addFeature(
+    geometry: Geometry | Position[],
+    defaultFields: Record<string, Record<string, string>>
+  ): Promise<void>;
   deleteFeature(featureId: string): Promise<void>;
   isFilterByMapBounds(): boolean;
 }
@@ -164,7 +168,10 @@ export class AbstractVectorSource extends AbstractSource implements IVectorSourc
     return null;
   }
 
-  async addFeature(geometry: Geometry | Position[]) {
+  async addFeature(
+    geometry: Geometry | Position[],
+    defaultFields: Record<string, Record<string, string>>
+  ) {
     throw new Error('Should implement VectorSource#addFeature');
   }
 
@@ -175,4 +182,8 @@ export class AbstractVectorSource extends AbstractSource implements IVectorSourc
   async supportsFeatureEditing(): Promise<boolean> {
     return false;
   }
+
+  async getDefaultFields(): Promise<Record<string, Record<string, string>>> {
+    return {};
+  }
 }
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index 4fce4c276c3360..c4340a051a07d1 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -52,6 +52,7 @@ export const getEmbeddableService = () => pluginsStart.embeddable;
 export const getNavigateToApp = () => coreStart.application.navigateToApp;
 export const getSavedObjectsTagging = () => pluginsStart.savedObjectsTagging;
 export const getPresentationUtilContext = () => pluginsStart.presentationUtil.ContextProvider;
+export const getSecurityService = () => pluginsStart.security;
 
 // xpack.maps.* kibana.yml settings from this plugin
 let mapAppConfig: MapsConfigType;
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index b526e7b24d90f9..7ee84eb8b67e20 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -71,6 +71,7 @@ import {
   MapsAppRegionMapLocatorDefinition,
   MapsAppTileMapLocatorDefinition,
 } from './locators';
+import { SecurityPluginStart } from '../../security/public';
 
 export interface MapsPluginSetupDependencies {
   inspector: InspectorSetupContract;
@@ -97,6 +98,7 @@ export interface MapsPluginStartDependencies {
   dashboard: DashboardStart;
   savedObjectsTagging?: SavedObjectTaggingPluginStart;
   presentationUtil: PresentationUtilPluginStart;
+  security: SecurityPluginStart;
 }
 
 /**
diff --git a/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts b/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
index 22c3da61244afa..cb2e144dc0cf29 100644
--- a/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
+++ b/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
@@ -7,7 +7,7 @@
 
 import { ElasticsearchClient, IScopedClusterClient } from 'kibana/server';
 import {
-  INDEX_META_DATA_CREATED_BY,
+  MAPS_NEW_VECTOR_LAYER_META_CREATED_BY,
   CreateDocSourceResp,
   IndexSourceMappings,
   BodySettings,
@@ -15,9 +15,9 @@ import {
 import { IndexPatternsCommonService } from '../../../../../src/plugins/data/server';
 
 const DEFAULT_SETTINGS = { number_of_shards: 1 };
-const DEFAULT_MAPPINGS = {
+const DEFAULT_META = {
   _meta: {
-    created_by: INDEX_META_DATA_CREATED_BY,
+    created_by: MAPS_NEW_VECTOR_LAYER_META_CREATED_BY,
   },
 };
 
@@ -50,7 +50,7 @@ async function createIndex(
 ) {
   const body: { mappings: IndexSourceMappings; settings: BodySettings } = {
     mappings: {
-      ...DEFAULT_MAPPINGS,
+      ...DEFAULT_META,
       ...mappings,
     },
     settings: DEFAULT_SETTINGS,
diff --git a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
index 6cae0d0630f902..52dd1c56d24351 100644
--- a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
+++ b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
@@ -14,11 +14,14 @@ import {
   MAX_DRAWING_SIZE_BYTES,
   GET_MATCHING_INDEXES_PATH,
   INDEX_FEATURE_PATH,
+  CHECK_IS_DRAWING_INDEX,
+  MAPS_NEW_VECTOR_LAYER_META_CREATED_BY,
 } from '../../common/constants';
 import { createDocSource } from './create_doc_source';
 import { writeDataToIndex } from './index_data';
 import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
 import { getMatchingIndexes } from './get_indexes_matching_pattern';
+import { SecurityPluginStart } from '../../../security/server';
 
 export function initIndexingRoutes({
   router,
@@ -28,6 +31,7 @@ export function initIndexingRoutes({
   router: IRouter<DataRequestHandlerContext>;
   logger: Logger;
   dataPlugin: DataPluginStart;
+  securityPlugin?: SecurityPluginStart;
 }) {
   router.post(
     {
@@ -174,4 +178,41 @@ export function initIndexingRoutes({
       return response.ok({ body: result });
     }
   );
+
+  router.get(
+    {
+      path: CHECK_IS_DRAWING_INDEX,
+      validate: {
+        query: schema.object({
+          index: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      const { index } = request.query;
+      try {
+        const {
+          body: mappingsResp,
+        } = await context.core.elasticsearch.client.asCurrentUser.indices.getMapping({
+          index: request.query.index,
+        });
+        const isDrawingIndex =
+          mappingsResp[index].mappings?._meta?.created_by === MAPS_NEW_VECTOR_LAYER_META_CREATED_BY;
+        return response.ok({
+          body: {
+            success: true,
+            isDrawingIndex,
+          },
+        });
+      } catch (error) {
+        // Index likely doesn't exist
+        return response.ok({
+          body: {
+            success: false,
+            error,
+          },
+        });
+      }
+    }
+  );
 }
diff --git a/x-pack/plugins/maps/server/routes.js b/x-pack/plugins/maps/server/routes.js
index f41e9a9d199b84..635770a562c2de 100644
--- a/x-pack/plugins/maps/server/routes.js
+++ b/x-pack/plugins/maps/server/routes.js
@@ -77,7 +77,10 @@ export async function initRoutes(core, getLicenseId, emsSettings, kbnVersion, lo
         landingPageUrl: emsSettings.getEMSLandingPageUrl(),
         fetchFunction: fetch,
       });
-      emsClient.addQueryParams({ license: currentLicenseId });
+      emsClient.addQueryParams({
+        license: currentLicenseId,
+        is_kibana_proxy: '1', // identifies this is proxied request from kibana
+      });
       return emsClient;
     } else {
       return EMPTY_EMS_CLIENT;
diff --git a/x-pack/plugins/ml/common/constants/usage_collection.ts b/x-pack/plugins/ml/common/constants/usage_collection.ts
index 647999d1903af6..5d09b90e185dbf 100644
--- a/x-pack/plugins/ml/common/constants/usage_collection.ts
+++ b/x-pack/plugins/ml/common/constants/usage_collection.ts
@@ -7,7 +7,9 @@
 
 export const ML_USAGE_EVENT = {
   IMPORTED_ANOMALY_DETECTOR_JOBS: 'imported_anomaly_detector_jobs',
+  IMPORT_FAILED_ANOMALY_DETECTOR_JOBS: 'import_failed_anomaly_detector_jobs',
   IMPORTED_DATA_FRAME_ANALYTICS_JOBS: 'imported_data_frame_analytics_jobs',
+  IMPORT_FAILED_DATA_FRAME_ANALYTICS_JOBS: 'import_failed_data_frame_analytics_jobs',
   EXPORTED_ANOMALY_DETECTOR_JOBS: 'exported_anomaly_detector_jobs',
   EXPORTED_DATA_FRAME_ANALYTICS_JOBS: 'exported_data_frame_analytics_jobs',
 } as const;
diff --git a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx
index 34e77d1b649224..01e3e667f05601 100644
--- a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx
@@ -197,8 +197,10 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
     const results = await bulkCreateJobs(jobs);
     let successCount = 0;
     const errors: ErrorType[] = [];
+    const failedJobIds = new Set();
     Object.entries(results).forEach(([jobId, { job, datafeed }]) => {
       if (job.error || datafeed.error) {
+        failedJobIds.add(jobId);
         if (job.error) {
           errors.push(job.error);
         }
@@ -214,7 +216,8 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
       displayImportSuccessToast(successCount);
     }
     if (errors.length > 0) {
-      displayImportErrorToast(errors);
+      displayImportErrorToast(errors, failedJobIds.size);
+      mlUsageCollection.count('import_failed_anomaly_detector_jobs', failedJobIds.size);
     }
   }, []);
 
@@ -234,7 +237,8 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
       displayImportSuccessToast(successCount);
     }
     if (errors.length > 0) {
-      displayImportErrorToast(errors);
+      displayImportErrorToast(errors, errors.length);
+      mlUsageCollection.count('import_failed_data_frame_analytics_jobs', errors.length);
     }
   }, []);
 
@@ -246,10 +250,10 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
     displaySuccessToast(title);
   }, []);
 
-  const displayImportErrorToast = useCallback((errors: ErrorType[]) => {
+  const displayImportErrorToast = useCallback((errors: ErrorType[], failureCount: number) => {
     const title = i18n.translate('xpack.ml.importExport.importFlyout.importJobErrorToast', {
       defaultMessage: '{count, plural, one {# job} other {# jobs}} failed to import correctly',
-      values: { count: errors.length },
+      values: { count: failureCount },
     });
 
     const errorList = errors.map(extractErrorProperties);
diff --git a/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts b/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts
index ec39d08ee357d5..158e522ddf9b3e 100644
--- a/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts
@@ -101,6 +101,7 @@ export const analysisConfigSchema = schema.object({
       stop_on_warn: schema.maybe(schema.boolean()),
     })
   ),
+  model_prune_window: schema.maybe(schema.string()),
 });
 
 export const anomalyDetectionJobSchema = {
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
index f24a9d7d7328e6..afa6ba728b41f0 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
@@ -154,7 +154,7 @@ const OBSERVABILITY_ALERT_CONSUMERS = [
   AlertConsumers.APM,
   AlertConsumers.LOGS,
   AlertConsumers.INFRASTRUCTURE,
-  AlertConsumers.SYNTHETICS,
+  AlertConsumers.UPTIME,
 ];
 
 function ObservabilityActions({
@@ -220,7 +220,7 @@ function ObservabilityActions({
   }, [afterCaseSelection, casePermissions, timelines, event]);
   return (
     <>
-      <EuiFlexGroup gutterSize="none">
+      <EuiFlexGroup gutterSize="none" responsive={false}>
         <EuiFlexItem>
           <EuiButtonIcon
             size="s"
diff --git a/x-pack/plugins/rule_registry/server/config.ts b/x-pack/plugins/rule_registry/server/config.ts
index ce1d44cdb94ee5..3b9155f319032c 100644
--- a/x-pack/plugins/rule_registry/server/config.ts
+++ b/x-pack/plugins/rule_registry/server/config.ts
@@ -13,8 +13,14 @@ export const config = {
     write: schema.object({
       enabled: schema.boolean({ defaultValue: false }),
     }),
-    index: schema.string({ defaultValue: '.alerts' }),
+    unsafe: schema.object({
+      legacyMultiTenancy: schema.object({
+        enabled: schema.boolean({ defaultValue: false }),
+      }),
+    }),
   }),
 };
 
 export type RuleRegistryPluginConfig = TypeOf<typeof config.schema>;
+
+export const INDEX_PREFIX = '.alerts' as const;
diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts
index 2325e5dd202332..ed6f19cd3af56e 100644
--- a/x-pack/plugins/rule_registry/server/plugin.ts
+++ b/x-pack/plugins/rule_registry/server/plugin.ts
@@ -13,12 +13,13 @@ import {
   KibanaRequest,
   CoreStart,
   IContextProvider,
+  SharedGlobalConfig,
 } from 'src/core/server';
 
 import { PluginStartContract as AlertingStart } from '../../alerting/server';
 import { SecurityPluginSetup } from '../../security/server';
 
-import { RuleRegistryPluginConfig } from './config';
+import { INDEX_PREFIX, RuleRegistryPluginConfig } from './config';
 import { RuleDataPluginService } from './rule_data_plugin_service';
 import { AlertsClientFactory } from './alert_data_client/alerts_client_factory';
 import { AlertsClient } from './alert_data_client/alerts_client';
@@ -51,6 +52,7 @@ export class RuleRegistryPlugin
       RuleRegistryPluginStartDependencies
     > {
   private readonly config: RuleRegistryPluginConfig;
+  private readonly legacyConfig: SharedGlobalConfig;
   private readonly logger: Logger;
   private readonly alertsClientFactory: AlertsClientFactory;
   private ruleDataService: RuleDataPluginService | null;
@@ -58,6 +60,8 @@ export class RuleRegistryPlugin
 
   constructor(initContext: PluginInitializerContext) {
     this.config = initContext.config.get<RuleRegistryPluginConfig>();
+    // TODO: Can be removed in 8.0.0. Exists to work around multi-tenancy users.
+    this.legacyConfig = initContext.config.legacy.get();
     this.logger = initContext.logger.get();
     this.ruleDataService = null;
     this.alertsClientFactory = new AlertsClientFactory();
@@ -67,7 +71,7 @@ export class RuleRegistryPlugin
     core: CoreSetup<RuleRegistryPluginStartDependencies, RuleRegistryPluginStartContract>,
     plugins: RuleRegistryPluginSetupDependencies
   ): RuleRegistryPluginSetupContract {
-    const { config, logger } = this;
+    const { logger } = this;
 
     const startDependencies = core.getStartServices().then(([coreStart, pluginStart]) => {
       return {
@@ -78,10 +82,25 @@ export class RuleRegistryPlugin
 
     this.security = plugins.security;
 
+    const isWriteEnabled = (config: RuleRegistryPluginConfig, legacyConfig: SharedGlobalConfig) => {
+      const hasEnabledWrite = config.write.enabled;
+      const hasSetCustomKibanaIndex = legacyConfig.kibana.index !== '.kibana';
+      const hasSetUnsafeAccess = config.unsafe.legacyMultiTenancy.enabled;
+
+      if (!hasEnabledWrite) return false;
+
+      // Not using legacy multi-tenancy
+      if (!hasSetCustomKibanaIndex) {
+        return hasEnabledWrite;
+      } else {
+        return hasSetUnsafeAccess;
+      }
+    };
+
     this.ruleDataService = new RuleDataPluginService({
       logger,
-      isWriteEnabled: config.write.enabled,
-      index: config.index,
+      isWriteEnabled: isWriteEnabled(this.config, this.legacyConfig),
+      index: INDEX_PREFIX,
       getClusterClient: async () => {
         const deps = await startDependencies;
         return deps.core.elasticsearch.client.asInternalUser;
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
index be11ec3f99910a..d49868aae92278 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
@@ -23,6 +23,9 @@ export interface EndpointAction {
   input_type: 'endpoint';
   agents: string[];
   user_id: string;
+  // the number of seconds Elastic Agent (on the host) should
+  // wait to send back an action result before it will timeout
+  timeout?: number;
   data: EndpointActionData;
 }
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/urls/compatibility.spec.ts b/x-pack/plugins/security_solution/cypress/integration/urls/compatibility.spec.ts
index fa4a5ee40d1262..928555c8fdd288 100644
--- a/x-pack/plugins/security_solution/cypress/integration/urls/compatibility.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/urls/compatibility.spec.ts
@@ -28,8 +28,8 @@ import {
 import { cleanKibana } from '../../tasks/common';
 
 const ABSOLUTE_DATE = {
-  endTime: '2019-08-01T20:33:29.186Z',
-  startTime: '2019-08-01T20:03:29.186Z',
+  endTime: 'Aug 1, 2019 @ 20:33:29.186',
+  startTime: 'Aug 1, 2019 @ 20:03:29.186',
 };
 
 const RULE_ID = '5a4a0460-d822-11eb-8962-bfd4aff0a9b3';
diff --git a/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts b/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
index a72657d78b70d5..47e6b0d34e3c55 100644
--- a/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
@@ -42,12 +42,14 @@ import { TIMELINE } from '../../screens/create_new_case';
 import { cleanKibana } from '../../tasks/common';
 
 const ABSOLUTE_DATE = {
-  endTime: '2019-08-01T20:33:29.186Z',
+  endTime: 'Aug 1, 2019 @ 20:33:29.186',
   endTimeTimeline: '2019-08-02T21:03:29.186Z',
+  endTimeTimelineFormatted: 'Aug 2, 2019 @ 21:03:29.186',
   newEndTimeTyped: 'Aug 01, 2019 @ 15:03:29.186',
   newStartTimeTyped: 'Aug 01, 2019 @ 14:33:29.186',
-  startTime: '2019-08-01T20:03:29.186Z',
+  startTime: 'Aug 1, 2019 @ 20:03:29.186',
   startTimeTimeline: '2019-08-02T20:03:29.186Z',
+  startTimeTimelineFormatted: 'Aug 2, 2019 @ 20:03:29.186',
   firefoxEndTimeTyped: '2019-08-01T15:03:29',
   firefoxStartTimeTyped: '2019-08-01T14:33:29',
 };
@@ -122,12 +124,12 @@ describe('url state', () => {
     cy.get(DATE_PICKER_START_DATE_POPOVER_BUTTON_TIMELINE).should(
       'have.attr',
       'title',
-      ABSOLUTE_DATE.startTimeTimeline
+      ABSOLUTE_DATE.startTimeTimelineFormatted
     );
     cy.get(DATE_PICKER_END_DATE_POPOVER_BUTTON_TIMELINE).should(
       'have.attr',
       'title',
-      ABSOLUTE_DATE.endTimeTimeline
+      ABSOLUTE_DATE.endTimeTimelineFormatted
     );
   });
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
index d6660effde38c1..2bfa5ae1aa3c4a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
@@ -274,6 +274,14 @@ describe('Host Isolation', () => {
         actionID
       );
     });
+    it('records the timeout in the action payload', async () => {
+      const ctx = await callRoute(ISOLATE_HOST_ROUTE, {
+        body: { endpoint_ids: ['XYZ'] },
+      });
+      const actionDoc: EndpointAction = (ctx.core.elasticsearch.client.asCurrentUser
+        .index as jest.Mock).mock.calls[0][0].body;
+      expect(actionDoc.timeout).toEqual(300);
+    });
 
     it('succeeds when just an endpoint ID is provided', async () => {
       await callRoute(ISOLATE_HOST_ROUTE, { body: { endpoint_ids: ['XYZ'] } });
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
index fceb45b17c2587..45f0e851dfdd1e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
@@ -120,6 +120,7 @@ export const isolationRequestHandler = function (
           input_type: 'endpoint',
           agents: endpointData.map((endpt: HostMetadata) => endpt.elastic.agent.id),
           user_id: user!.username,
+          timeout: 300, // 5 minutes
           data: {
             command: isolate ? 'isolate' : 'unisolate',
             comment: req.body.comment ?? undefined,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/README.md b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/README.md
index 059005707625ff..893797afa44d7b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/README.md
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/README.md
@@ -58,7 +58,7 @@ to any newly saved rule:
             {
               "name" : "param:exceptionsList_0",
               "id" : "endpoint_list",
-              "type" : "exception-list"
+              "type" : "exception-list-agnostic"
             },
             {
               "name" : "param:exceptionsList_1",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
index 56a1e875ac5e7c..75180c6eaee486 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
@@ -8,8 +8,11 @@
 import { extractExceptionsList } from './extract_exceptions_list';
 import { loggingSystemMock } from 'src/core/server/mocks';
 import { RuleParams } from '../../schemas/rule_schemas';
-import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
-import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils';
+import {
+  EXCEPTION_LIST_NAMESPACE,
+  EXCEPTION_LIST_NAMESPACE_AGNOSTIC,
+} from '@kbn/securitysolution-list-constants';
+import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils/constants';
 
 describe('extract_exceptions_list', () => {
   type FuncReturn = ReturnType<typeof extractExceptionsList>;
@@ -48,21 +51,21 @@ describe('extract_exceptions_list', () => {
       {
         id: '123',
         name: `${EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME}_0`,
-        type: EXCEPTION_LIST_NAMESPACE,
+        type: EXCEPTION_LIST_NAMESPACE_AGNOSTIC,
       },
     ]);
   });
 
-  test('It returns two exception lists transformed into a saved object references', () => {
+  test('It returns 2 exception lists transformed into a saved object references', () => {
     const twoInputs: RuleParams['exceptionsList'] = [
       mockExceptionsList()[0],
-      { ...mockExceptionsList()[0], id: '976' },
+      { ...mockExceptionsList()[0], id: '976', namespace_type: 'single' },
     ];
     expect(extractExceptionsList({ logger, exceptionsList: twoInputs })).toEqual<FuncReturn>([
       {
         id: '123',
         name: `${EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME}_0`,
-        type: EXCEPTION_LIST_NAMESPACE,
+        type: EXCEPTION_LIST_NAMESPACE_AGNOSTIC,
       },
       {
         id: '976',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
index 9b7f8bbcefee1b..93deae014005b8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
@@ -6,7 +6,7 @@
  */
 
 import { Logger, SavedObjectReference } from 'src/core/server';
-import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
+import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { getSavedObjectNamePatternForExceptionsList } from './utils';
 
@@ -35,7 +35,7 @@ export const extractExceptionsList = ({
     return exceptionsList.map((exceptionItem, index) => ({
       name: getSavedObjectNamePatternForExceptionsList(index),
       id: exceptionItem.id,
-      type: EXCEPTION_LIST_NAMESPACE,
+      type: getSavedObjectType({ namespaceType: exceptionItem.namespace_type }),
     }));
   }
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
index 31288559e94377..df5fdf4fcead47 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
@@ -8,8 +8,11 @@
 import { loggingSystemMock } from 'src/core/server/mocks';
 import { extractReferences } from './extract_references';
 import { RuleParams } from '../../schemas/rule_schemas';
-import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
-import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils';
+import {
+  EXCEPTION_LIST_NAMESPACE,
+  EXCEPTION_LIST_NAMESPACE_AGNOSTIC,
+} from '@kbn/securitysolution-list-constants';
+import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils/constants';
 
 describe('extract_references', () => {
   type FuncReturn = ReturnType<typeof extractReferences>;
@@ -43,6 +46,36 @@ describe('extract_references', () => {
         {
           id: '123',
           name: `${EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME}_0`,
+          type: EXCEPTION_LIST_NAMESPACE_AGNOSTIC,
+        },
+      ],
+    });
+  });
+
+  test('It returns params untouched and the references extracted as 2 exception list saved object references', () => {
+    const params: Partial<RuleParams> = {
+      note: 'some note',
+      exceptionsList: [
+        mockExceptionsList()[0],
+        { ...mockExceptionsList()[0], id: '456', namespace_type: 'single' },
+      ],
+    };
+    expect(
+      extractReferences({
+        logger,
+        params: params as RuleParams,
+      })
+    ).toEqual<FuncReturn>({
+      params: params as RuleParams,
+      references: [
+        {
+          id: '123',
+          name: `${EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME}_0`,
+          type: EXCEPTION_LIST_NAMESPACE_AGNOSTIC,
+        },
+        {
+          id: '456',
+          name: `${EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME}_1`,
           type: EXCEPTION_LIST_NAMESPACE,
         },
       ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
index fc35088da66fce..72373eebf4fbaa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
@@ -7,10 +7,10 @@
 
 import { loggingSystemMock } from 'src/core/server/mocks';
 import { SavedObjectReference } from 'src/core/server';
-import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils';
 import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
 import { injectExceptionsReferences } from './inject_exceptions_list';
 import { RuleParams } from '../../schemas/rule_schemas';
+import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils/constants';
 
 describe('inject_exceptions_list', () => {
   type FuncReturn = ReturnType<typeof injectExceptionsReferences>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
index a80f19ae011d76..eae4cb20f7948f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
@@ -7,10 +7,10 @@
 
 import { loggingSystemMock } from 'src/core/server/mocks';
 import { SavedObjectReference } from 'src/core/server';
-import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils';
 import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
 import { injectReferences } from './inject_references';
 import { RuleParams } from '../../schemas/rule_schemas';
+import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './utils/constants';
 
 describe('inject_references', () => {
   type FuncReturn = ReturnType<typeof injectReferences>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern.ts
index f4e33cf57fa2b2..f0fd4e86e44b00 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern.ts
@@ -6,7 +6,7 @@
  */
 
 /**
- * Given a name and index this will return the pattern of "${name_${index}"
+ * Given a name and index this will return the pattern of "${name}_${index}"
  * @param name The name to suffix the string
  * @param index The index to suffix the string
  * @returns The pattern "${name_${index}"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern_for_exception_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern_for_exception_list.test.ts
index 98c575e8835be0..82bf2e1506f977 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern_for_exception_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_name_pattern_for_exception_list.test.ts
@@ -5,10 +5,8 @@
  * 2.0.
  */
 
-import {
-  EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME,
-  getSavedObjectNamePatternForExceptionsList,
-} from '.';
+import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './constants';
+import { getSavedObjectNamePatternForExceptionsList } from './get_saved_object_name_pattern_for_exception_list';
 
 describe('get_saved_object_name_pattern_for_exception_list', () => {
   test('returns expected pattern given a zero', () => {
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
index 182e7cd5bcabfe..5dbea8e2f4deeb 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
@@ -21,6 +21,9 @@ import { asTaskPollingCycleEvent, asTaskRunEvent, TaskPersistence } from './task
 import { TaskRunResult } from './task_running';
 import { TaskPoolRunResult } from './task_pool';
 import { TaskPoolMock } from './task_pool.mock';
+import { executionContextServiceMock } from '../../../../src/core/server/mocks';
+
+const executionContext = executionContextServiceMock.createSetupContract();
 
 describe('EphemeralTaskLifecycle', () => {
   function initTaskLifecycleParams({
@@ -37,6 +40,7 @@ describe('EphemeralTaskLifecycle', () => {
     const opts: EphemeralTaskLifecycleOpts = {
       logger: taskManagerLogger,
       definitions: new TaskTypeDictionary(taskManagerLogger),
+      executionContext,
       config: {
         enabled: true,
         max_workers: 10,
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
index ce719ebed36e44..ded9091b4f2263 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
@@ -7,7 +7,7 @@
 
 import { Subject, Observable, Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { Logger } from '../../../../src/core/server';
+import { Logger, ExecutionContextStart } from '../../../../src/core/server';
 
 import { Result, asErr, asOk } from './lib/result_type';
 import { TaskManagerConfig } from './config';
@@ -28,6 +28,7 @@ export interface EphemeralTaskLifecycleOpts {
   elasticsearchAndSOAvailability$: Observable<boolean>;
   pool: TaskPool;
   lifecycleEvent: Observable<TaskLifecycleEvent>;
+  executionContext: ExecutionContextStart;
 }
 
 export type EphemeralTaskInstanceRequest = Omit<EphemeralTaskInstance, 'startedAt'>;
@@ -46,6 +47,7 @@ export class EphemeralTaskLifecycle {
   private config: TaskManagerConfig;
   private middleware: Middleware;
   private lifecycleSubscription: Subscription = Subscription.EMPTY;
+  private readonly executionContext: ExecutionContextStart;
 
   constructor({
     logger,
@@ -54,6 +56,7 @@ export class EphemeralTaskLifecycle {
     pool,
     lifecycleEvent,
     config,
+    executionContext,
   }: EphemeralTaskLifecycleOpts) {
     this.logger = logger;
     this.middleware = middleware;
@@ -61,6 +64,7 @@ export class EphemeralTaskLifecycle {
     this.pool = pool;
     this.lifecycleEvent = lifecycleEvent;
     this.config = config;
+    this.executionContext = executionContext;
 
     if (this.enabled) {
       this.lifecycleSubscription = this.lifecycleEvent
@@ -179,6 +183,7 @@ export class EphemeralTaskLifecycle {
       beforeRun: this.middleware.beforeRun,
       beforeMarkRunning: this.middleware.beforeMarkRunning,
       onTaskEvent: this.emitEvent,
+      executionContext: this.executionContext,
     });
   };
 }
diff --git a/x-pack/plugins/task_manager/server/plugin.ts b/x-pack/plugins/task_manager/server/plugin.ts
index 3d3d180fc06653..11746e2da2847e 100644
--- a/x-pack/plugins/task_manager/server/plugin.ts
+++ b/x-pack/plugins/task_manager/server/plugin.ts
@@ -126,7 +126,11 @@ export class TaskManagerPlugin
     };
   }
 
-  public start({ savedObjects, elasticsearch }: CoreStart): TaskManagerStartContract {
+  public start({
+    savedObjects,
+    elasticsearch,
+    executionContext,
+  }: CoreStart): TaskManagerStartContract {
     const savedObjectsRepository = savedObjects.createInternalRepository(['task']);
 
     const serializer = savedObjects.createSerializer();
@@ -150,6 +154,7 @@ export class TaskManagerPlugin
       config: this.config!,
       definitions: this.definitions,
       logger: this.logger,
+      executionContext,
       taskStore,
       middleware: this.middleware,
       elasticsearchAndSOAvailability$: this.elasticsearchAndSOAvailability$!,
@@ -160,6 +165,7 @@ export class TaskManagerPlugin
       config: this.config!,
       definitions: this.definitions,
       logger: this.logger,
+      executionContext,
       middleware: this.middleware,
       elasticsearchAndSOAvailability$: this.elasticsearchAndSOAvailability$!,
       pool: this.taskPollingLifecycle.pool,
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
index aad03951bbb9b1..42bccbcbaba899 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
@@ -20,7 +20,9 @@ import type { TaskClaiming as TaskClaimingClass } from './queries/task_claiming'
 import { asOk, Err, isErr, isOk, Result } from './lib/result_type';
 import { FillPoolResult } from './lib/fill_pool';
 import { ElasticsearchResponseError } from './lib/identify_es_error';
+import { executionContextServiceMock } from '../../../../src/core/server/mocks';
 
+const executionContext = executionContextServiceMock.createSetupContract();
 let mockTaskClaiming = taskClaimingMock.create({});
 jest.mock('./queries/task_claiming', () => {
   return {
@@ -69,6 +71,7 @@ describe('TaskPollingLifecycle', () => {
     middleware: createInitialMiddleware(),
     maxWorkersConfiguration$: of(100),
     pollIntervalConfiguration$: of(100),
+    executionContext,
   };
 
   beforeEach(() => {
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
index 16b15d0c46e3ea..847e1f32e8f2af 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
@@ -9,7 +9,7 @@ import { Subject, Observable, Subscription } from 'rxjs';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, some, map as mapOptional } from 'fp-ts/lib/Option';
 import { tap } from 'rxjs/operators';
-import { Logger } from '../../../../src/core/server';
+import type { Logger, ExecutionContextStart } from '../../../../src/core/server';
 
 import { Result, asErr, mapErr, asOk, map, mapOk } from './lib/result_type';
 import { ManagedConfiguration } from './lib/create_managed_configuration';
@@ -53,6 +53,7 @@ export type TaskPollingLifecycleOpts = {
   config: TaskManagerConfig;
   middleware: Middleware;
   elasticsearchAndSOAvailability$: Observable<boolean>;
+  executionContext: ExecutionContextStart;
 } & ManagedConfiguration;
 
 export type TaskLifecycleEvent =
@@ -73,6 +74,7 @@ export class TaskPollingLifecycle {
   private store: TaskStore;
   private taskClaiming: TaskClaiming;
   private bufferedStore: BufferedTaskStore;
+  private readonly executionContext: ExecutionContextStart;
 
   private logger: Logger;
   public pool: TaskPool;
@@ -100,11 +102,13 @@ export class TaskPollingLifecycle {
     config,
     taskStore,
     definitions,
+    executionContext,
   }: TaskPollingLifecycleOpts) {
     this.logger = logger;
     this.middleware = middleware;
     this.definitions = definitions;
     this.store = taskStore;
+    this.executionContext = executionContext;
 
     const emitEvent = (event: TaskLifecycleEvent) => this.events$.next(event);
 
@@ -227,6 +231,7 @@ export class TaskPollingLifecycle {
       beforeMarkRunning: this.middleware.beforeMarkRunning,
       onTaskEvent: this.emitEvent,
       defaultMaxAttempts: this.taskClaiming.maxAttempts,
+      executionContext: this.executionContext,
     });
   };
 
diff --git a/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts b/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
index bc1ff0541fdffc..358a8003382b02 100644
--- a/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
@@ -14,7 +14,7 @@
 import apm from 'elastic-apm-node';
 import { withSpan } from '@kbn/apm-utils';
 import { identity } from 'lodash';
-import { Logger } from '../../../../../src/core/server';
+import { Logger, ExecutionContextStart } from '../../../../../src/core/server';
 
 import { Middleware } from '../lib/middleware';
 import { asOk, asErr, eitherAsync, Result } from '../lib/result_type';
@@ -54,6 +54,7 @@ type Opts = {
   definitions: TaskTypeDictionary;
   instance: EphemeralTaskInstance;
   onTaskEvent?: (event: TaskRun | TaskMarkRunning) => void;
+  executionContext: ExecutionContextStart;
 } & Pick<Middleware, 'beforeRun' | 'beforeMarkRunning'>;
 
 // ephemeral tasks cannot be rescheduled or scheduled to run again in the future
@@ -74,6 +75,7 @@ export class EphemeralTaskManagerRunner implements TaskRunner {
   private beforeRun: Middleware['beforeRun'];
   private beforeMarkRunning: Middleware['beforeMarkRunning'];
   private onTaskEvent: (event: TaskRun | TaskMarkRunning) => void;
+  private readonly executionContext: ExecutionContextStart;
 
   /**
    * Creates an instance of EphemeralTaskManagerRunner.
@@ -91,6 +93,7 @@ export class EphemeralTaskManagerRunner implements TaskRunner {
     beforeRun,
     beforeMarkRunning,
     onTaskEvent = identity,
+    executionContext,
   }: Opts) {
     this.instance = asPending(asConcreteInstance(sanitizeInstance(instance)));
     this.definitions = definitions;
@@ -98,6 +101,7 @@ export class EphemeralTaskManagerRunner implements TaskRunner {
     this.beforeRun = beforeRun;
     this.beforeMarkRunning = beforeMarkRunning;
     this.onTaskEvent = onTaskEvent;
+    this.executionContext = executionContext;
   }
 
   /**
@@ -193,8 +197,14 @@ export class EphemeralTaskManagerRunner implements TaskRunner {
     const stopTaskTimer = startTaskTimer();
     try {
       this.task = this.definition.createTaskRunner(modifiedContext);
-      const result = await withSpan({ name: 'ephemeral run', type: 'task manager' }, () =>
-        this.task!.run()
+      const ctx = {
+        type: 'task manager',
+        name: `run ephemeral ${this.instance.task.taskType}`,
+        id: this.instance.task.id,
+        description: 'run ephemeral task',
+      };
+      const result = await this.executionContext.withContext(ctx, () =>
+        withSpan({ name: 'ephemeral run', type: 'task manager' }, () => this.task!.run())
       );
       const validatedResult = this.validateResult(result);
       const processedResult = await withSpan(
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
index e54962c7c8857f..b78232d59803e7 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
@@ -25,7 +25,9 @@ import { mockLogger } from '../test_utils';
 import { throwUnrecoverableError } from './errors';
 import { taskStoreMock } from '../task_store.mock';
 import apm from 'elastic-apm-node';
+import { executionContextServiceMock } from '../../../../../src/core/server/mocks';
 
+const executionContext = executionContextServiceMock.createSetupContract();
 const minutesFromNow = (mins: number): Date => secondsFromNow(mins * 60);
 
 let fakeTimer: sinon.SinonFakeTimers;
@@ -103,6 +105,31 @@ describe('TaskManagerRunner', () => {
       );
       expect(mockApmTrans.end).toHaveBeenCalledWith('failure');
     });
+    test('provides execution context on run', async () => {
+      const { runner } = await readyToRunStageSetup({
+        definitions: {
+          bar: {
+            title: 'Bar!',
+            createTaskRunner: () => ({
+              async run() {
+                return { state: {} };
+              },
+            }),
+          },
+        },
+      });
+      await runner.run();
+      expect(executionContext.withContext).toHaveBeenCalledTimes(1);
+      expect(executionContext.withContext).toHaveBeenCalledWith(
+        {
+          description: 'run task',
+          id: 'foo',
+          name: 'run bar',
+          type: 'task manager',
+        },
+        expect.any(Function)
+      );
+    });
     test('provides details about the task that is running', async () => {
       const { runner } = await pendingStageSetup({
         instance: {
@@ -690,6 +717,31 @@ describe('TaskManagerRunner', () => {
       });
       expect(mockApmTrans.end).toHaveBeenCalledWith('failure');
     });
+    test('provides execution context on run', async () => {
+      const { runner } = await readyToRunStageSetup({
+        definitions: {
+          bar: {
+            title: 'Bar!',
+            createTaskRunner: () => ({
+              async run() {
+                return { state: {} };
+              },
+            }),
+          },
+        },
+      });
+      await runner.run();
+      expect(executionContext.withContext).toHaveBeenCalledTimes(1);
+      expect(executionContext.withContext).toHaveBeenCalledWith(
+        {
+          description: 'run task',
+          id: 'foo',
+          name: 'run bar',
+          type: 'task manager',
+        },
+        expect.any(Function)
+      );
+    });
     test('queues a reattempt if the task fails', async () => {
       const initialAttempts = _.random(0, 2);
       const id = Date.now().toString();
@@ -1465,6 +1517,7 @@ describe('TaskManagerRunner', () => {
       instance,
       definitions,
       onTaskEvent: opts.onTaskEvent,
+      executionContext,
     });
 
     if (stage === TaskRunningStage.READY_TO_RUN) {
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
index 97b40a75a59c45..30aa0cd0c522e1 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
@@ -15,7 +15,11 @@ import apm from 'elastic-apm-node';
 import { withSpan } from '@kbn/apm-utils';
 import { performance } from 'perf_hooks';
 import { identity, defaults, flow } from 'lodash';
-import { Logger, SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import {
+  Logger,
+  SavedObjectsErrorHelpers,
+  ExecutionContextStart,
+} from '../../../../../src/core/server';
 
 import { Middleware } from '../lib/middleware';
 import {
@@ -93,6 +97,7 @@ type Opts = {
   store: Updatable;
   onTaskEvent?: (event: TaskRun | TaskMarkRunning) => void;
   defaultMaxAttempts: number;
+  executionContext: ExecutionContextStart;
 } & Pick<Middleware, 'beforeRun' | 'beforeMarkRunning'>;
 
 export enum TaskRunResult {
@@ -137,6 +142,7 @@ export class TaskManagerRunner implements TaskRunner {
   private beforeMarkRunning: Middleware['beforeMarkRunning'];
   private onTaskEvent: (event: TaskRun | TaskMarkRunning) => void;
   private defaultMaxAttempts: number;
+  private readonly executionContext: ExecutionContextStart;
 
   /**
    * Creates an instance of TaskManagerRunner.
@@ -157,6 +163,7 @@ export class TaskManagerRunner implements TaskRunner {
     beforeMarkRunning,
     defaultMaxAttempts,
     onTaskEvent = identity,
+    executionContext,
   }: Opts) {
     this.instance = asPending(sanitizeInstance(instance));
     this.definitions = definitions;
@@ -166,6 +173,7 @@ export class TaskManagerRunner implements TaskRunner {
     this.beforeMarkRunning = beforeMarkRunning;
     this.onTaskEvent = onTaskEvent;
     this.defaultMaxAttempts = defaultMaxAttempts;
+    this.executionContext = executionContext;
   }
 
   /**
@@ -261,7 +269,15 @@ export class TaskManagerRunner implements TaskRunner {
 
     try {
       this.task = this.definition.createTaskRunner(modifiedContext);
-      const result = await withSpan({ name: 'run', type: 'task manager' }, () => this.task!.run());
+      const ctx = {
+        type: 'task manager',
+        name: `run ${this.instance.task.taskType}`,
+        id: this.instance.task.id,
+        description: 'run task',
+      };
+      const result = await this.executionContext.withContext(ctx, () =>
+        withSpan({ name: 'run', type: 'task manager' }, () => this.task!.run())
+      );
       const validatedResult = this.validateResult(result);
       const processedResult = await withSpan({ name: 'process result', type: 'task manager' }, () =>
         this.processResult(validatedResult, stopTaskTimer())
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6160f22675cb9c..4ac21c140d0eb3 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -3173,9 +3173,6 @@
     "kibanaOverview.addData.sampleDataButtonLabel": "サンプルデータを試す",
     "kibanaOverview.addData.sectionTitle": "データを取り込む",
     "kibanaOverview.apps.title": "これらのアプリを検索",
-    "kibanaOverview.gettingStarted.addDataButtonLabel": "データを追加",
-    "kibanaOverview.gettingStarted.description": "Kibanaを使用すると、データや方法を可視化する能力が高まります。 1つの質問から始めて、解答から知見を得ることができます。",
-    "kibanaOverview.gettingStarted.title": "Kibanaの基本操作",
     "kibanaOverview.header.title": "Kibana",
     "kibanaOverview.kibana.appDescription1": "ダッシュボードでデータを分析します。",
     "kibanaOverview.kibana.appDescription2": "インサイトを検索して見つけます。",
@@ -8067,7 +8064,6 @@
     "xpack.dataVisualizer.file.welcomeContent.newlineDelimitedJsonDescription": "改行区切りの JSON",
     "xpack.dataVisualizer.file.welcomeContent.supportedFileFormatDescription": "ファイルデータビジュアライザーはこれらのファイル形式をサポートしています：",
     "xpack.dataVisualizer.file.welcomeContent.uploadedFilesAllowedSizeDescription": "最大{maxFileSize}のファイルをアップロードできます。",
-    "xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileDescription": "ファイルデータビジュアライザーは、ログファイルのフィールドとメトリックの理解に役立ちます。ファイルをアップロードして、データを分析し、 Elasticsearch インデックスにインポートするか選択できます。",
     "xpack.dataVisualizer.file.xmlNotCurrentlySupportedErrorMessage": "XML は現在サポートされていません",
     "xpack.dataVisualizer.fileBeatConfig.paths": "ファイルのパスをここに追加してください",
     "xpack.dataVisualizer.fileBeatConfigFlyout.closeButton": "閉じる",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 0a65035a585e5e..08267263a4601f 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -3187,9 +3187,6 @@
     "kibanaOverview.addData.sampleDataButtonLabel": "试用我们的样例数据",
     "kibanaOverview.addData.sectionTitle": "采集您的数据",
     "kibanaOverview.apps.title": "浏览这些应用",
-    "kibanaOverview.gettingStarted.addDataButtonLabel": "添加您的数据",
-    "kibanaOverview.gettingStarted.description": "Kibana 使您能够以自己的方式可视化数据。 首先提个问题，看看答案将您带往何处。",
-    "kibanaOverview.gettingStarted.title": "Kibana 入门",
     "kibanaOverview.header.title": "Kibana",
     "kibanaOverview.kibana.appDescription1": "在仪表板中分析数据。",
     "kibanaOverview.kibana.appDescription2": "搜索和查找数据分析结果。",
@@ -8301,7 +8298,6 @@
     "xpack.dataVisualizer.file.welcomeContent.newlineDelimitedJsonDescription": "换行符分隔的 JSON",
     "xpack.dataVisualizer.file.welcomeContent.supportedFileFormatDescription": "File Data Visualizer 支持以下文件格式：",
     "xpack.dataVisualizer.file.welcomeContent.uploadedFilesAllowedSizeDescription": "您可以上传不超过 {maxFileSize} 的文件。",
-    "xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileDescription": "File Data Visualizer 可帮助您理解日志文件中的字段和指标。上传文件、分析文件数据，然后选择是否将数据导入 Elasticsearch 索引。",
     "xpack.dataVisualizer.file.xmlNotCurrentlySupportedErrorMessage": "当前不支持 XML",
     "xpack.dataVisualizer.fileBeatConfig.paths": "在此处将路径添加您的文件中",
     "xpack.dataVisualizer.fileBeatConfigFlyout.closeButton": "关闭",
diff --git a/x-pack/plugins/triggers_actions_ui/public/index.ts b/x-pack/plugins/triggers_actions_ui/public/index.ts
index eedc5566ba1d5d..b50a7efc9d9071 100644
--- a/x-pack/plugins/triggers_actions_ui/public/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/index.ts
@@ -21,6 +21,7 @@ export type {
   IErrorObject,
   AlertFlyoutCloseReason,
   AlertTypeParams,
+  AsApiContract,
 } from './types';
 
 export {
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index b17d0493c4494b..f01967592ea8c1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -17,6 +17,7 @@ import {
   AlertHistoryDocumentTemplate,
   ALERT_HISTORY_PREFIX,
   AlertHistoryDefaultIndexName,
+  AsApiContract,
 } from '../../actions/common';
 import { TypeRegistry } from './application/type_registry';
 import {
@@ -58,6 +59,7 @@ export {
   AlertHistoryDocumentTemplate,
   AlertHistoryDefaultIndexName,
   ALERT_HISTORY_PREFIX,
+  AsApiContract,
 };
 
 export type ActionTypeIndex = Record<string, ActionType>;
diff --git a/x-pack/plugins/uptime/common/constants/rest_api.ts b/x-pack/plugins/uptime/common/constants/rest_api.ts
index 6a75686266533b..b49ccc3222a075 100644
--- a/x-pack/plugins/uptime/common/constants/rest_api.ts
+++ b/x-pack/plugins/uptime/common/constants/rest_api.ts
@@ -26,9 +26,9 @@ export enum API_URLS {
   ML_CAPABILITIES = '/api/ml/ml_capabilities',
   ML_ANOMALIES_RESULT = `/api/ml/results/anomalies_table_data`,
 
-  ALERT_ACTIONS = '/api/actions',
-  CREATE_ALERT = '/api/alerts/alert',
-  ALERT = '/api/alerts/alert/',
-  ALERTS_FIND = '/api/alerts/_find',
-  ACTION_TYPES = '/api/actions/list_action_types',
+  RULE_CONNECTORS = '/api/actions/connectors',
+  CREATE_RULE = '/api/alerting/rule',
+  DELETE_RULE = '/api/alerting/rule/',
+  RULES_FIND = '/api/alerting/rules/_find',
+  CONNECTOR_TYPES = '/api/actions/connector_types',
 }
diff --git a/x-pack/plugins/uptime/public/state/api/alert_actions.test.ts b/x-pack/plugins/uptime/public/state/api/alert_actions.test.ts
index 15fb95f5d4a4d8..96c581f7fab986 100644
--- a/x-pack/plugins/uptime/public/state/api/alert_actions.test.ts
+++ b/x-pack/plugins/uptime/public/state/api/alert_actions.test.ts
@@ -58,7 +58,6 @@ describe('Alert Actions factory', () => {
     });
     expect(resp).toEqual([
       {
-        actionTypeId: '.pagerduty',
         group: 'recovered',
         id: 'f2a3b195-ed76-499a-805d-82d24d4eeba9',
         params: {
@@ -69,7 +68,6 @@ describe('Alert Actions factory', () => {
         },
       },
       {
-        actionTypeId: '.pagerduty',
         group: 'xpack.uptime.alerts.actionGroups.monitorStatus',
         id: 'f2a3b195-ed76-499a-805d-82d24d4eeba9',
         params: {
@@ -103,7 +101,6 @@ describe('Alert Actions factory', () => {
     });
     expect(resp).toEqual([
       {
-        actionTypeId: '.pagerduty',
         group: 'recovered',
         id: 'f2a3b195-ed76-499a-805d-82d24d4eeba9',
         params: {
@@ -114,7 +111,6 @@ describe('Alert Actions factory', () => {
         },
       },
       {
-        actionTypeId: '.pagerduty',
         group: 'xpack.uptime.alerts.actionGroups.monitorStatus',
         id: 'f2a3b195-ed76-499a-805d-82d24d4eeba9',
         params: {
diff --git a/x-pack/plugins/uptime/public/state/api/alert_actions.ts b/x-pack/plugins/uptime/public/state/api/alert_actions.ts
index fff5fa9a678048..b0f5f3ea490e50 100644
--- a/x-pack/plugins/uptime/public/state/api/alert_actions.ts
+++ b/x-pack/plugins/uptime/public/state/api/alert_actions.ts
@@ -33,6 +33,8 @@ export const WEBHOOK_ACTION_ID: ActionTypeId = '.webhook';
 
 const { MONITOR_STATUS } = ACTION_GROUP_DEFINITIONS;
 
+export type RuleAction = Omit<AlertAction, 'actionTypeId'>;
+
 const getRecoveryMessage = (selectedMonitor: Ping) => {
   return i18n.translate('xpack.uptime.alerts.monitorStatus.recoveryMessage', {
     defaultMessage: 'Monitor {monitor} with url {url} has recovered with status Up',
@@ -44,18 +46,16 @@ const getRecoveryMessage = (selectedMonitor: Ping) => {
 };
 
 export function populateAlertActions({ defaultActions, selectedMonitor }: NewAlertParams) {
-  const actions: AlertAction[] = [];
+  const actions: RuleAction[] = [];
   defaultActions.forEach((aId) => {
-    const action: AlertAction = {
+    const action: RuleAction = {
       id: aId.id,
-      actionTypeId: aId.actionTypeId,
       group: MONITOR_STATUS.id,
       params: {},
     };
 
-    const recoveredAction: AlertAction = {
+    const recoveredAction: RuleAction = {
       id: aId.id,
-      actionTypeId: aId.actionTypeId,
       group: 'recovered',
       params: {
         message: getRecoveryMessage(selectedMonitor),
diff --git a/x-pack/plugins/uptime/public/state/api/alerts.ts b/x-pack/plugins/uptime/public/state/api/alerts.ts
index 5931936c48163e..d74a73befb5d04 100644
--- a/x-pack/plugins/uptime/public/state/api/alerts.ts
+++ b/x-pack/plugins/uptime/public/state/api/alerts.ts
@@ -10,18 +10,35 @@ import { apiService } from './utils';
 import { ActionConnector } from '../alerts/alerts';
 
 import { AlertsResult, MonitorIdParam } from '../actions/types';
-import { ActionType, AlertAction } from '../../../../triggers_actions_ui/public';
+import { ActionType, AsApiContract } from '../../../../triggers_actions_ui/public';
 import { API_URLS } from '../../../common/constants';
 import { Alert, AlertTypeParams } from '../../../../alerting/common';
 import { AtomicStatusCheckParams } from '../../../common/runtime_types/alerts';
 
-import { populateAlertActions } from './alert_actions';
+import { populateAlertActions, RuleAction } from './alert_actions';
 import { Ping } from '../../../common/runtime_types/ping';
 
 const UPTIME_AUTO_ALERT = 'UPTIME_AUTO';
 
-export const fetchConnectors = async () => {
-  return await apiService.get(API_URLS.ALERT_ACTIONS);
+export const fetchConnectors = async (): Promise<ActionConnector[]> => {
+  const response = (await apiService.get(API_URLS.RULE_CONNECTORS)) as Array<
+    AsApiContract<ActionConnector>
+  >;
+  return response.map(
+    ({
+      connector_type_id: actionTypeId,
+      referenced_by_count: referencedByCount,
+      is_preconfigured: isPreconfigured,
+      is_missing_secrets: isMissingSecrets,
+      ...res
+    }) => ({
+      ...res,
+      actionTypeId,
+      referencedByCount,
+      isPreconfigured,
+      isMissingSecrets,
+    })
+  );
 };
 
 export interface NewAlertParams extends AlertTypeParams {
@@ -41,14 +58,21 @@ type NewMonitorStatusAlert = Omit<
   | 'muteAll'
   | 'mutedInstanceIds'
   | 'executionStatus'
->;
+  | 'alertTypeId'
+  | 'notifyWhen'
+  | 'actions'
+> & {
+  rule_type_id: Alert<AtomicStatusCheckParams>['alertTypeId'];
+  notify_when: Alert<AtomicStatusCheckParams>['notifyWhen'];
+  actions: RuleAction[];
+};
 
 export const createAlert = async ({
   defaultActions,
   monitorId,
   selectedMonitor,
 }: NewAlertParams): Promise<Alert> => {
-  const actions: AlertAction[] = populateAlertActions({
+  const actions: RuleAction[] = populateAlertActions({
     defaultActions,
     selectedMonitor,
   });
@@ -66,16 +90,16 @@ export const createAlert = async ({
       filters: { 'url.port': [], 'observer.geo.name': [], 'monitor.type': [], tags: [] },
     },
     consumer: 'uptime',
-    alertTypeId: CLIENT_ALERT_TYPES.MONITOR_STATUS,
+    rule_type_id: CLIENT_ALERT_TYPES.MONITOR_STATUS,
     schedule: { interval: '1m' },
-    notifyWhen: 'onActionGroupChange',
+    notify_when: 'onActionGroupChange',
     tags: [UPTIME_AUTO_ALERT],
     name: `${selectedMonitor?.monitor.name || selectedMonitor?.url?.full}(Simple status alert)`,
     enabled: true,
     throttle: null,
   };
 
-  return await apiService.post(API_URLS.CREATE_ALERT, data);
+  return await apiService.post(API_URLS.CREATE_RULE, data);
 };
 
 export const fetchMonitorAlertRecords = async (): Promise<AlertsResult> => {
@@ -89,7 +113,7 @@ export const fetchMonitorAlertRecords = async (): Promise<AlertsResult> => {
     search_fields: ['name', 'tags'],
     search: 'UPTIME_AUTO',
   };
-  return await apiService.get(API_URLS.ALERTS_FIND, data);
+  return await apiService.get(API_URLS.RULES_FIND, data);
 };
 
 export const fetchAlertRecords = async ({
@@ -103,14 +127,29 @@ export const fetchAlertRecords = async ({
     sort_field: 'name.keyword',
     sort_order: 'asc',
   };
-  const alerts = await apiService.get(API_URLS.ALERTS_FIND, data);
+  const alerts = await apiService.get(API_URLS.RULES_FIND, data);
   return alerts.data.find((alert: Alert<NewAlertParams>) => alert.params.monitorId === monitorId);
 };
 
 export const disableAlertById = async ({ alertId }: { alertId: string }) => {
-  return await apiService.delete(API_URLS.ALERT + alertId);
+  return await apiService.delete(API_URLS.DELETE_RULE + alertId);
 };
 
 export const fetchActionTypes = async (): Promise<ActionType[]> => {
-  return await apiService.get(API_URLS.ACTION_TYPES);
+  const response = (await apiService.get(API_URLS.CONNECTOR_TYPES)) as Array<
+    AsApiContract<ActionType>
+  >;
+  return response.map<ActionType>(
+    ({
+      enabled_in_config: enabledInConfig,
+      enabled_in_license: enabledInLicense,
+      minimum_license_required: minimumLicenseRequired,
+      ...res
+    }: AsApiContract<ActionType>) => ({
+      ...res,
+      enabledInConfig,
+      enabledInLicense,
+      minimumLicenseRequired,
+    })
+  );
 };
diff --git a/x-pack/plugins/uptime/server/plugin.ts b/x-pack/plugins/uptime/server/plugin.ts
index 3e935eab153acd..a201eddc453456 100644
--- a/x-pack/plugins/uptime/server/plugin.ts
+++ b/x-pack/plugins/uptime/server/plugin.ts
@@ -36,8 +36,8 @@ export class Plugin implements PluginType {
     const { ruleDataService } = plugins.ruleRegistry;
 
     const ruleDataClient = ruleDataService.initializeIndex({
-      feature: 'synthetics',
-      registrationContext: 'observability.synthetics',
+      feature: 'uptime',
+      registrationContext: 'observability.uptime',
       dataset: Dataset.alerts,
       componentTemplateRefs: [],
       componentTemplates: [
diff --git a/x-pack/test/api_integration/apis/maps/index.js b/x-pack/test/api_integration/apis/maps/index.js
index 6d4122163d66ac..bd2505905c3952 100644
--- a/x-pack/test/api_integration/apis/maps/index.js
+++ b/x-pack/test/api_integration/apis/maps/index.js
@@ -22,6 +22,7 @@ export default function ({ loadTestFile, getService }) {
     describe('', () => {
       loadTestFile(require.resolve('./get_indexes_matching_pattern'));
       loadTestFile(require.resolve('./create_doc_source'));
+      loadTestFile(require.resolve('./validate_drawing_index'));
       loadTestFile(require.resolve('./delete_feature'));
       loadTestFile(require.resolve('./index_data'));
       loadTestFile(require.resolve('./fonts_api'));
diff --git a/x-pack/test/api_integration/apis/maps/validate_drawing_index.js b/x-pack/test/api_integration/apis/maps/validate_drawing_index.js
new file mode 100644
index 00000000000000..491847c37be6d5
--- /dev/null
+++ b/x-pack/test/api_integration/apis/maps/validate_drawing_index.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+
+export default function ({ getService }) {
+  const supertest = getService('supertest');
+
+  describe('validate drawing index', () => {
+    it('confirm valid drawing index', async () => {
+      await supertest
+        .post(`/api/maps/docSource`)
+        .set('kbn-xsrf', 'kibana')
+        .send({
+          index: 'valid-drawing-index',
+          mappings: { properties: { coordinates: { type: 'geo_point' } } },
+        });
+
+      const resp = await supertest
+        .get(`/api/maps/checkIsDrawingIndex?index=valid-drawing-index`)
+        .set('kbn-xsrf', 'kibana')
+        .expect(200);
+
+      expect(resp.body.success).to.be(true);
+      expect(resp.body.isDrawingIndex).to.be(true);
+    });
+
+    it('confirm valid index that is not a drawing index', async () => {
+      const resp = await supertest
+        .get(`/api/maps/checkIsDrawingIndex?index=geo_shapes`)
+        .set('kbn-xsrf', 'kibana')
+        .expect(200);
+
+      expect(resp.body.success).to.be(true);
+      expect(resp.body.isDrawingIndex).to.be(false);
+    });
+
+    it('confirm invalid index', async () => {
+      const resp = await supertest
+        .get(`/api/maps/checkIsDrawingIndex?index=not-an-index`)
+        .set('kbn-xsrf', 'kibana')
+        .expect(200);
+
+      expect(resp.body.success).to.be(false);
+    });
+  });
+}
diff --git a/x-pack/test/apm_api_integration/configs/index.ts b/x-pack/test/apm_api_integration/configs/index.ts
index 793197e9fc1b89..51bcb30a0c1764 100644
--- a/x-pack/test/apm_api_integration/configs/index.ts
+++ b/x-pack/test/apm_api_integration/configs/index.ts
@@ -27,7 +27,6 @@ const apmFtrConfigs = {
     license: 'trial' as const,
     kibanaConfig: {
       'migrations.enableV2': 'false',
-      'xpack.ruleRegistry.index': '.kibana-alerts',
       'xpack.ruleRegistry.write.enabled': 'true',
     },
   },
diff --git a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
index 7ff81defe5ff21..e1bd5a8d05b48c 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
@@ -42,7 +42,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   const BULK_INDEX_DELAY = 1000;
   const INDEXING_DELAY = 5000;
 
-  const ALERTS_INDEX_TARGET = '.kibana-alerts-observability.apm.alerts*';
+  const ALERTS_INDEX_TARGET = '.alerts-observability.apm.alerts*';
   const APM_METRIC_INDEX_NAME = 'apm-8.0.0-transaction';
 
   const createTransactionMetric = (override: Record<string, any>) => {
diff --git a/x-pack/test/functional_enterprise_search/cypress.config.ts b/x-pack/test/functional_enterprise_search/cypress.config.ts
new file mode 100644
index 00000000000000..9a6918ab0557d4
--- /dev/null
+++ b/x-pack/test/functional_enterprise_search/cypress.config.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+// TODO: If Kibana CI doesn't end up using this (e.g., uses Dockerized containers
+// instead of the functional test server), we can opt to delete this file later.
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const baseConfig = await readConfigFile(require.resolve('./base_config'));
+
+  return {
+    // default to the xpack functional config
+    ...baseConfig.getAll(),
+
+    esTestCluster: {
+      ...baseConfig.get('esTestCluster'),
+      serverArgs: [
+        ...baseConfig.get('esTestCluster.serverArgs'),
+        'xpack.security.enabled=true',
+        'xpack.security.authc.api_key.enabled=true',
+      ],
+    },
+
+    kbnTestServer: {
+      ...baseConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...baseConfig.get('kbnTestServer.serverArgs'),
+        '--csp.strict=false',
+        '--csp.warnLegacyBrowsers=false',
+        '--enterpriseSearch.host=http://localhost:3002',
+      ],
+    },
+  };
+}
diff --git a/yarn.lock b/yarn.lock
index bfceb3f209cf11..121ba05364a81b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1466,10 +1466,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@36.1.0":
-  version "36.1.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-36.1.0.tgz#99946e193bc9d1616f52cbd16e1a5bc196bd450f"
-  integrity sha512-j09Kv5K9YBkb9NkM3+cGparJeYfjLfwyypG27UYvSOLCpOYxS3bPycwmD7QrzPjoTqH+HHzDanHSwJMp6ttabA==
+"@elastic/eui@37.1.1":
+  version "37.1.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-37.1.1.tgz#06bd1e1908b8b56525107a3eca42af036b950ab5"
+  integrity sha512-wEehwi9Ei81ydl8ExDuALbzDH6dgaHqKSlv/3Pmm+BcuW8FW4ctr8K5YPSJ7+5hdOdG0Bps5nnIpCDEinXSsLw==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"